tree bee58eb2ecc6b03515607c282d94982f5f9482e8
parent bc5e0e85049bdb4b1fb23401cd0548a68e263707
parent 43162fe50cb2e2e7861df97380fad815a54dac2e
author Dan Albert <danalbert@google.com> 1424305982 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424305982 +0000

am 43162fe5: am 076f5479: Merge "Use headers from adb."

* commit '43162fe50cb2e2e7861df97380fad815a54dac2e':
  Use headers from adb.