tree 68d2f637c486544fad0410937a4cb043f05ac24c
parent f8328e774444731c44393c642aee86f9a7935a7c
parent 8641daeea1c9990934562593828b85d8dceb5a04
author Elliott Hughes <enh@google.com> 1418762104 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418762104 +0000

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

* commit '8641daeea1c9990934562593828b85d8dceb5a04':
  Lose chcon to toybox.