tree 8cbfdd2b69ae6d36dcacaadec6f12b0f899a040c
parent 81ad2bf86354638cfe5d7fa1eeb84882d69be19d
parent cfe46542e424e5e2159cf5212f72ae8f53c589a6
author Dan Albert <danalbert@google.com> 1431108893 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431108893 +0000

am cfe46542: am 3128176e: Merge "Fix build following adb change."

* commit 'cfe46542e424e5e2159cf5212f72ae8f53c589a6':
  Fix build following adb change.