| commit | 26ba4bdd92b52285322eee4cab6c055d91f37739 | [log] [tgz] |
|---|---|---|
| author | Yabin Cui <yabinc@google.com> | Thu Aug 27 11:50:04 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:50:04 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | e5db32407f4962ab37fa4c35ba4864a88c9986e2 [diff] | |
| parent | 214a32c9efde2e235253ee6ae11b1114a8cb071b [diff] |
am 2df4804a: (-s ours) am 20e8b384: am c70ac57d: Merge "adb: poll for emulator connection." * commit '2df4804ace526029b622c34e3200e6d71f2f265a':