| commit | b63c762f41fe4cb1a4b7065c0fa3f9996b9d62e7 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:32:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:32:55 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 3a5140f9d065fa66bc13cad627ffc39571a63809 [diff] | |
| parent | 3732233339770abc5c978f60712f82c219f31f3a [diff] |
am 1aae6d52: am a4a90243: (-s ours) am c1b6378d: am e1101677: Merge "adb: fix killing of old version of adb process" * commit '1aae6d526ef7fbe0ade1875f68a12d4b7651b8a1':