tree 2f1b64472a00fe9d5db02215e47e7157a3b28962
parent 2190bda167777d4d8279a9941be83bcfa281acc8
parent c54c972b291141768e274adc3a33dae713fc0dcb
author Elliott Hughes <enh@google.com> 1427749847 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427749847 +0000

am 1f9a2288: am ffa85da6: Merge "Lose route to toybox."

* commit '1f9a22882f4fa0a0714b51904c264279bf1a5dbd':
  Lose route to toybox.