| commit | a1ea15d1f74fab2220c492159170862f60fd0084 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Apr 29 20:01:51 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 20:01:51 2015 +0000 |
| tree | 798e7b769008dbe910dabfba759e3d29f17630a7 | |
| parent | 88f753c8b3aa5b01cdf1b9521a42d1b3bcff1937 [diff] | |
| parent | 8e30d93a0a697af5aa9f417289c3e51e2aad84ce [diff] |
am 0c799f68: am ffa0d24d: Merge "Fix Win32 build." * commit '0c799f68204d4eac55941d33d41dd13011c8123a': Fix Win32 build.