| commit | 8965fb45d356385fae74a4d9a8e003cf009c8b5f | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:44:12 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:44:12 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | fc3c4acf3e5fef2de8eaae50f8f1b4ace1c365b9 [diff] | |
| parent | 9e6b3ae2eb33b2ecf3daa758615f481d6d09691e [diff] |
am 4bc35f3e: (-s ours) am 51d08e8e: am 2e942a47: Merge "Fix Win32 adb build." * commit '4bc35f3e4ce5ec94f70bed6ac78cbc8ea186448f':