commit | 88455313cca4a75f5fdac54a2971043b5813236b | [log] [tgz] |
---|---|---|
author | Robert Greenwalt <rgreenwalt@google.com> | Mon Jan 14 12:00:37 2013 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jan 14 12:00:37 2013 -0800 |
tree | 2515c523c6d5ce0cdff4ecbde81668377bf52175 | |
parent | 25753d500d9ef6ee04dad43ffa27287a6dc959ac [diff] | |
parent | 3911886e854d31058e7d3a6e310e8eafd06c02e0 [diff] |
am 3911886e: am d67cc366: resolved conflicts for merge of b40c2385 to jb-mr1.1-dev * commit '3911886e854d31058e7d3a6e310e8eafd06c02e0': Fix a TOCTOU and symlink attack in netd.