commit | 4bc35f3e4ce5ec94f70bed6ac78cbc8ea186448f | [log] [tgz] |
---|---|---|
author | Elliott Hughes <enh@google.com> | Fri Jul 24 21:02:54 2015 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 21:02:54 2015 +0000 |
tree | d2cba6ab7e7fd2fa9f0fc6e8b71cef8132302802 | |
parent | 62b3f91d142e8c0b698729d3d7f3f4a9b8924c2f [diff] | |
parent | 51d08e8e7abe50051650b1ea5936006c6d6da3e9 [diff] |
am 51d08e8e: am 2e942a47: Merge "Fix Win32 adb build." * commit '51d08e8e7abe50051650b1ea5936006c6d6da3e9': Fix Win32 adb build.