tree ba6a3e2f30e9d451bb04a720000d795f5507e163
parent dc74ad2df86992603ab1d411b193c098dcdb06c7
parent cc825ae79219f2b5d9fa768d50963ad2f43bbd11
author Elliott Hughes <enh@google.com> 1418776098 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418776098 +0000

am cc825ae7: Merge "Lose cp to toybox."

* commit 'cc825ae79219f2b5d9fa768d50963ad2f43bbd11':
  Lose cp to toybox.