tree f110e4ff83d85f9582d11cf6344d651e2f4afe7f
parent 9385e3df6446a17ff896c48d42e4d4b937b046d8
parent cf41769375f34dbf17de52df02e4881ecfee0c8b
author Colin Cross <ccross@android.com> 1335511435 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1335511435 -0700

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

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