| commit | 92e48de783a805d81a6584b2664304fb71eec2d4 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Dec 10 21:50:09 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 10 21:50:09 2014 +0000 |
| tree | 82164b6d42a61d221d7a5628fd0d39e5fd60b4a4 | |
| parent | 7690c52d306349e6e862cd3291ac522ffae93bb0 [diff] | |
| parent | c71562dd9dc73c6d6bd7ccd25e14f0fb35f95e69 [diff] |
am c71562dd: am 1dbf33b0: Merge "Fix build on mac." * commit 'c71562dd9dc73c6d6bd7ccd25e14f0fb35f95e69': Fix build on mac.