| commit | 96c01f83a4bb89dc0808258508bdc7fb92073d29 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Mar 04 06:36:02 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Mar 04 06:36:02 2015 +0000 |
| tree | fe02275f9bf644975223864fa3260ec2bbedc196 | |
| parent | e8ca99c4fb11f5d41d3a946ab536b5a7be95e96e [diff] | |
| parent | d1e748c071fdf3508c371f0806614d5f67437333 [diff] |
am d1e748c0: am a10263ed: am ccf1cc55: Merge "Fix the mac build." * commit 'd1e748c071fdf3508c371f0806614d5f67437333': Fix the mac build.