| commit | f7026ee55fd95993685789d50042de98b8213b60 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 11:37:16 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 11:37:16 2015 +0000 |
| tree | 8c31250a527d15d67e52f8d8871ae6062178ee22 | |
| parent | ae78b2dd0b73a2b99ea72b90f751e71b0da3403e [diff] | |
| parent | a5f117a4fce089c4ad8f675a5404f1879a8d92e5 [diff] |
am d15baf01: (-s ours) am 9d748c8b: am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32." * commit 'd15baf01806834699285e6b788a2963c1062084e':