| commit | 51644a0497ebfd3f7abb980608770800d1ae1754 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Aug 27 14:21:17 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Aug 27 14:21:17 2015 +0000 |
| tree | 5672430a9f41c6eb948db44ee1706bd3fb354ba9 | |
| parent | f17a82f85d862ca65b4fe0a2fe9cf6233213e5ef [diff] | |
| parent | f7026ee55fd95993685789d50042de98b8213b60 [diff] |
am aab10418: am d15baf01: (-s ours) am 9d748c8b: am a6241a02: Merge "Replace HAVE_WIN32_IPC with _WIN32." * commit 'aab10418a3958ccc4606523645deb2638f01f9b7':