| commit | 651815cdaf423d918ee79f5fe103406c538d1d25 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Feb 25 18:47:40 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 18:47:40 2015 +0000 |
| tree | 592f59906217543cc45729862d16bb9b2918f6b5 | |
| parent | d704764124721cb9cd2e9fcaec9c695c0d82f0ec [diff] | |
| parent | be1f8ec9068a89e36b7ff566a8b4aebc0944dcc7 [diff] |
am 3b7ccba7: am 186a38bc: am d75d6c91: Merge "Fix the mac build." * commit '3b7ccba743db3a8922658f728232f9584b40ff83': Fix the mac build.