commit | 6d832a5562d26d128ed748ac7447125960e2ca3a | [log] [tgz] |
---|---|---|
author | Jason Sams <jsams@google.com> | Thu Feb 13 21:38:01 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Feb 13 21:38:01 2014 +0000 |
tree | 0e65d721d9b975348a75221850989d090b663059 | |
parent | 3fc59b4b09a05a8bd8b24e4a479e6941a9cc99f4 [diff] | |
parent | 48d2f68175a79fb4d49301af6753cb8fcdd4501a [diff] |
am 48d2f681: am 67cad86c: Merge "Fix mac build." * commit '48d2f68175a79fb4d49301af6753cb8fcdd4501a': Fix mac build.