tree 8cbfdd2b69ae6d36dcacaadec6f12b0f899a040c
parent 3257155e8957b8cba4b59d7928990f1642183415
parent 3128176e7d8f5cee4afdff3b5fdcadbe66ef97af
author Dan Albert <danalbert@google.com> 1431108220 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431108220 +0000

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

* commit '3128176e7d8f5cee4afdff3b5fdcadbe66ef97af':
  Fix build following adb change.