| commit | d031bd7924fbe9e776a035229a87283de31e75b9 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:28:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:28:40 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 4e18bf8c3900416dcbc8cce554e71571147ba663 [diff] | |
| parent | 8965fb45d356385fae74a4d9a8e003cf009c8b5f [diff] |
am 674641eb: am 4bc35f3e: (-s ours) am 51d08e8e: am 2e942a47: Merge "Fix Win32 adb build." * commit '674641eba44e471172c35a46460c6334bac50069':