| commit | 7a73b2eecd7b74d0a2091119d087cdfa105d449e | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Feb 05 20:15:03 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 05 20:15:03 2015 +0000 |
| tree | 4f8149ca27b65b8ea2442304749573a85503cf64 | |
| parent | de290beddd0144d8ba61d9b102126bc7e43d6386 [diff] | |
| parent | 984e01e54ebaab5d413b80661e1311be2c15b464 [diff] |
am 984e01e5: am 6c3ff4fe: Merge "Fix Windows build." * commit '984e01e54ebaab5d413b80661e1311be2c15b464': Fix Windows build.