| commit | be1f8ec9068a89e36b7ff566a8b4aebc0944dcc7 | [log] [tgz] |
|---|---|---|
| author | Dan Albert <danalbert@google.com> | Wed Feb 25 18:40:55 2015 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Feb 25 18:40:55 2015 +0000 |
| tree | f185c28a1b21b23afd9dd531787bc963fe1adfdf | |
| parent | 6dbaf0155cba0019c76559698529cec325a16e84 [diff] | |
| parent | 982a24cdc0aba6a67cff46d473ba9afd5cfeec6f [diff] |
am 186a38bc: am d75d6c91: Merge "Fix the mac build." * commit '186a38bc7be031af7211dd9a4ecbd071a573fd9a': Fix the mac build.