tree 15b71202e176c6854f52e3995df53fe5eee3b306
parent dadb89495d558b55f09a8a57820111886316cf4e
parent c27c4eadc28a390785dfaf1867948d3787b81df1
author Elliott Hughes <enh@google.com> 1418939390 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418939390 +0000

am c27c4ead: Merge "Prepare CTS for the future where toybox has fully replaced toolbox."

* commit 'c27c4eadc28a390785dfaf1867948d3787b81df1':
  Prepare CTS for the future where toybox has fully replaced toolbox.