tree 9dce7e049769aa824deff68534a83cdc56c967d6
parent 9c1c205931311d576442b5025391d851b22afccb
parent a02ff986fc0fe5543bb2168814eee04eac8ef579
author Colin Cross <ccross@android.com> 1335511106 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335511106 -0700

am a02ff986: Merge "init: Add noexec mount option"

* commit 'a02ff986fc0fe5543bb2168814eee04eac8ef579':
  init: Add noexec mount option