tree 4b39b7332353a649daf9e5f795b278f48ee571fc
parent 80436522e8d027ddb31afada47fc2109b8afde8a
parent d67cc366f769a84f56755b12d2c943113ec46f8c
author Robert Greenwalt <rgreenwalt@google.com> 1358193500 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1358193500 -0800

am d67cc366: resolved conflicts for merge of b40c2385 to jb-mr1.1-dev

* commit 'd67cc366f769a84f56755b12d2c943113ec46f8c':
  Fix a TOCTOU and symlink attack in netd.