| commit | 3e13925d1986ca452117f189c782068a5c2e21a4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:28:46 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:28:46 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | 645fcc6f59c0b76f37bfe941647ade5a6655c0dc [diff] | |
| parent | 379b69156fdccd3765ad7942dd932ba8ae4a9bef [diff] |
am d0c94f5b: am 187afaf5: (-s ours) am 7d86f5e5: am 239f6ac8: Merge "Fix Win32 adb build (for the second time today)." * commit 'd0c94f5bab1fcda272aa8267c00b503922ce3700':