tree 8cbfdd2b69ae6d36dcacaadec6f12b0f899a040c
parent c23a39b1a48c4ed30605fd10f04ee7a1781d529c
parent 9cd94f87283159d80a51e1fce6ff68c97158b7ae
author Dan Albert <danalbert@google.com> 1431109660 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431109660 +0000

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

* commit '9cd94f87283159d80a51e1fce6ff68c97158b7ae':
  Fix build following adb change.