| commit | 379b69156fdccd3765ad7942dd932ba8ae4a9bef | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:44:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:44:46 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | 7f65c9081584c59aa877f3ae820bb9a4067a6fca [diff] | |
| parent | 6af1ac8d1f515e30a088d39d4ea78c8b1e5cfaa0 [diff] |
am 187afaf5: (-s ours) am 7d86f5e5: am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)." * commit '187afaf54f76f4a4a2598de7c66f8ecf32c0ee2a':