tree 2f1b64472a00fe9d5db02215e47e7157a3b28962
parent 011ef852e5f9aa8689ab6ee139229cd2f9a2391a
parent 1994ca02d34ababdffc7476d5bf32902d5a6aff3
author Elliott Hughes <enh@google.com> 1427749442 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1427749442 +0000

am ffa85da6: Merge "Lose route to toybox."

* commit 'ffa85da6125c4b820fdecfd2b49acfb2631fb07a':
  Lose route to toybox.