| commit | 3732233339770abc5c978f60712f82c219f31f3a | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:51:29 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:51:29 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 918ef5814d23a647b6c717668eca71dc2488c7f5 [diff] | |
| parent | ab1e7f742a62688c3fa1b3fe72cc93861d5380ae [diff] |
am a4a90243: (-s ours) am c1b6378d: am e1101677: Merge "adb: fix killing of old version of adb process" * commit 'a4a902432e45933e86f40f25eb4ab96743f61ebd':