| commit | 984e01e54ebaab5d413b80661e1311be2c15b464 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Feb 05 18:47:24 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 18:47:24 2015 +0000 |
| tree | 48f8cb5183ed10367777da7aa54557daef8a2f51 | |
| parent | 05d8a22c2d75e8945e372ef0bb251fabb055a3df [diff] | |
| parent | 6c3ff4fe7f0b1cd729bf61974dde845b611b99c0 [diff] |
am 6c3ff4fe: Merge "Fix Windows build." * commit '6c3ff4fe7f0b1cd729bf61974dde845b611b99c0': Fix Windows build.