tree a1755c5799eb06d91f440b49d3276f9406c68fa1
parent c6a47d39c56906e25c57148c50c4142f24ffae95
parent 9ebc6c6b6006a36499524bae3c282ec2cc1f41eb
author Elliott Hughes <enh@google.com> 1418167405 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418167405 +0000

am 9ebc6c6b: am 51248395: Merge "Clean up adb/Android.mk"

* commit '9ebc6c6b6006a36499524bae3c282ec2cc1f41eb':
  Clean up adb/Android.mk