tree e2f571e5eff657283cc9a082671c5ef8e8970fb6
parent 3d495b3e95eb5f583d7b3a6d5887710519614ef7
parent b21bd7729137d5c2894b4425609d07f48f36d460
author Elliott Hughes <enh@google.com> 1428106187 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1428106187 +0000

am b21bd772: am a62eac5c: am 50f192fa: Merge "Fix "adb devices -l"."

* commit 'b21bd7729137d5c2894b4425609d07f48f36d460':
  Fix "adb devices -l".