commit | 3911886e854d31058e7d3a6e310e8eafd06c02e0 | [log] [tgz] |
---|---|---|
author | Robert Greenwalt <rgreenwalt@google.com> | Mon Jan 14 11:58:20 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 14 11:58:20 2013 -0800 |
tree | 4b39b7332353a649daf9e5f795b278f48ee571fc | |
parent | 80436522e8d027ddb31afada47fc2109b8afde8a [diff] | |
parent | d67cc366f769a84f56755b12d2c943113ec46f8c [diff] |
am d67cc366: resolved conflicts for merge of b40c2385 to jb-mr1.1-dev * commit 'd67cc366f769a84f56755b12d2c943113ec46f8c': Fix a TOCTOU and symlink attack in netd.