tree 3b523d47ba060fc4fef48076159766ada9823d39
parent 258a72a3481df3b24bfc1ac2147773de7225e249
parent 26251bc956a52f6cf98c9fb483918648291a9b5c
author Elliott Hughes <enh@google.com> 1423587170 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423587170 +0000

am 830914a4: Merge "Lose touch to toybox."

* commit '830914a4b6c42d04004e2ec3ff38823f6be8c23f':
  Lose touch to toybox.