commit | 79517d4f9f196bfd11388583e970d5c710951561 | [log] [tgz] |
---|---|---|
author | Josh Gao <jmgao@google.com> | Fri Nov 18 00:43:02 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Fri Nov 18 00:43:02 2016 +0000 |
tree | 12d454efd8e2f6de1938c482c86e3fce13cd12c7 | |
parent | 8dab84a6738df8f5b62786bf1fdcedd1eb8eaa76 [diff] | |
parent | 5751e3335dfe683de68090f0c84b600fd6da4f76 [diff] |
Merge "adb: actually fix the windows build." into klp-dev am: da66b9100a am: 0b4bd3feea am: 55d871c401 am: 8027acd140 am: 7e21e1efeb am: fa961006fd am: 50dcfdf43a am: f69ff66c5f am: 238a980143 am: ffcd14a9b9 am: 7149e3e72a am: 058bae82ed am: 5751e3335d Change-Id: I865faac0c4674fc9a1088781112881cc36515fa4