| commit | d1e748c071fdf3508c371f0806614d5f67437333 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Mar 04 06:29:34 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 06:29:34 2015 +0000 |
| tree | 76982fb009411595abdc5e45095f1a650ef18a62 | |
| parent | 4aa76e5563d3951b66de612cf7015ce554863349 [diff] | |
| parent | a10263ed1f1532127a135943dce993443c5dca51 [diff] |
am a10263ed: am ccf1cc55: Merge "Fix the mac build." * commit 'a10263ed1f1532127a135943dce993443c5dca51': Fix the mac build.