tree b1d28191f13537d7612343b254fc3569e6f3219b
parent 96a74f8a9a51430b4a193ddb6ae8a632ce0bc54d
parent d57e0d5d7e0fa0c32114be41417839a45a7c18d7
author Elliott Hughes <enh@google.com> 1418766568 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418766568 +0000

am d57e0d5d: am 8641daee: Merge "Lose chcon to toybox."

* commit 'd57e0d5d7e0fa0c32114be41417839a45a7c18d7':
  Lose chcon to toybox.