tree 22f5cb5b381a02b91720222b9c6e2813f97eff95
parent e34de3a77b5f4d408af3f812b304475e858246ec
parent 0e3234b7f11048d8291d5427cc0acfb77ba6b843
author Nick Kralevich <nnk@google.com> 1439240879 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1439240879 +0000

am 0e3234b7: am 1efe1bdd: Merge "More O_DIRECTORY | O_NOFOLLOW changes"

* commit '0e3234b7f11048d8291d5427cc0acfb77ba6b843':
  More O_DIRECTORY | O_NOFOLLOW changes