| commit | 7d86f5e527c01d3fda84575af98888ee117159ee | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Fri Jul 24 21:47:49 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Jul 24 21:47:49 2015 +0000 |
| tree | e5ee5d504361d35c58465e3fc00c14ecd228d46c | |
| parent | f077e45cc47d1bf16779f3a689bd0cd857cb7f03 [diff] | |
| parent | 239f6ac8e73e294eaf21ec70a9f2f7a3631ab964 [diff] |
am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)." * commit '239f6ac8e73e294eaf21ec70a9f2f7a3631ab964': Fix Win32 adb build (for the second time today).