tree 88ab20246a6bd7b3b7b9e78252e99971e1ff627b
parent bd3212fd92470fa76577530fbc515c866755e722
parent 7584e9906308db18db924f0576e84707adf0cbf3
author Elliott Hughes <enh@google.com> 1428465623 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428465623 +0000

am 7584e990: am 6994d3fa: am bf403968: Merge "Lose setprop to toybox."

* commit '7584e9906308db18db924f0576e84707adf0cbf3':
  Lose setprop to toybox.