| commit | c6f82796ba557c6e433695e6503619a530b0174a | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Tue Nov 04 13:54:26 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 13:54:26 2014 +0000 |
| tree | f5ffdfc71a57c7c2974f3ab9e6d87765002f0ed5 | |
| parent | 1f6955c65a8638e03ee2656675395f50be0d61e1 [diff] | |
| parent | 2490b5b282fadd6ff9381cb8baf42911f49aeec3 [diff] |
am 2490b5b2: am e03864e9: Merge "Try to fix mac build." * commit '2490b5b282fadd6ff9381cb8baf42911f49aeec3': Try to fix mac build.