| commit | 3b7ccba743db3a8922658f728232f9584b40ff83 | [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 | ac9471041e5c2d2903ce6470a35ba5b3baf80aa0 [diff] | |
| parent | 186a38bc7be031af7211dd9a4ecbd071a573fd9a [diff] |
am 186a38bc: am d75d6c91: Merge "Fix the mac build." * commit '186a38bc7be031af7211dd9a4ecbd071a573fd9a': Fix the mac build.