| commit | 8e30d93a0a697af5aa9f417289c3e51e2aad84ce | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Apr 29 19:49:41 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Apr 29 19:49:41 2015 +0000 |
| tree | 411636275007d1fa281cf035e44fa59f3d38e12a | |
| parent | b81743fab8b65c0b0f532fbf48c1d6448b401485 [diff] | |
| parent | 1e9e25447c87e14ba49ea190fe0cadaec3b0d649 [diff] |
am ffa0d24d: Merge "Fix Win32 build." * commit 'ffa0d24d09f22d81b8e47f7a27a7aec5f421a023': Fix Win32 build.