| commit | f529a3cf6246fd6c884faba2a1c9f6e139d7b331 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Wed Feb 25 17:19:47 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 17:19:47 2015 +0000 |
| tree | d7b9275eb6ce8a54c9d4308b64f52d2ac03077ca | |
| parent | dc47cbb57717eb1fc93916ae1bff48ae603251b1 [diff] | |
| parent | 8a9ff12be424b0b9c171f40b984c4d7032aed460 [diff] |
am 8a9ff12b: Merge "Fix windows build." * commit '8a9ff12be424b0b9c171f40b984c4d7032aed460': Fix windows build.
