OSDN Git Service

am d67cc366: resolved conflicts for merge of b40c2385 to jb-mr1.1-dev
authorRobert Greenwalt <rgreenwalt@google.com>
Mon, 14 Jan 2013 19:58:20 +0000 (11:58 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 14 Jan 2013 19:58:20 +0000 (11:58 -0800)
* commit 'd67cc366f769a84f56755b12d2c943113ec46f8c':
  Fix a TOCTOU and symlink attack in netd.


Trivial merge