commit | 2490b5b282fadd6ff9381cb8baf42911f49aeec3 | [log] [tgz] |
---|---|---|
author | Nicolas Geoffray <ngeoffray@google.com> | Tue Nov 04 13:49:19 2014 +0000 |
committer | Android Git Automerger <android-git-automerger@android.com> | Tue Nov 04 13:49:19 2014 +0000 |
tree | 70323da4b1b62d951f7598d1c03b7235bfdd38a5 | |
parent | a11c391458d2cda4c1510c50f84824c6d42291f7 [diff] | |
parent | e03864e99f5ab0e27a48a17275122ad8f324b615 [diff] |
am e03864e9: Merge "Try to fix mac build." * commit 'e03864e99f5ab0e27a48a17275122ad8f324b615': Try to fix mac build.