commit | 4fe3c4e989ab5fdf53e371d6155b4f672a8e9ebd | [log] [tgz] |
---|---|---|
author | Yabin Cui <yabinc@google.com> | Thu Aug 27 14:31:16 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:31:16 2015 +0000 |
tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
parent | 26aa7c3955a1bf87006060cb46013e5cbf2468ee [diff] | |
parent | 26ba4bdd92b52285322eee4cab6c055d91f37739 [diff] |
am 8f0daa52: am 2df4804a: (-s ours) am 20e8b384: am c70ac57d: Merge "adb: poll for emulator connection." * commit '8f0daa520dfd4bc29c04cb85799abf8fd648bd7b':