tree b4e77beaa28fb350fd94ad2f9dbc1e032bdc39a1
parent 91f68a4735e7ca9facaf0bad45a97e7ea25213c4
parent 4eb6c71e7f013e684828ae6216f61b83be552282
author Dan Albert <danalbert@google.com> 1424372210 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1424372210 +0000

am 4eb6c71e: Merge "Move adb_main to its own file."

* commit '4eb6c71e7f013e684828ae6216f61b83be552282':
  Move adb_main to its own file.