| commit | 2ba3611b780fc2be9b98376f4ce033f9fee8860f | [log] [tgz] |
|---|---|---|
| author | Nicolas Geoffray <ngeoffray@google.com> | Tue Oct 20 12:43:41 2015 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 12:43:41 2015 +0000 |
| tree | a97c508946ad8910386343b33f76e46af8ea87c6 | |
| parent | 4c7494434719fa218eef3c3e72c98777b7407d11 [diff] | |
| parent | 658a94f94cac35a39dc38c79fea9b7a2f8dbb6aa [diff] |
Merge "New attempt at fixing mac build." am: 620021e643 am: 658a94f94c * commit '658a94f94cac35a39dc38c79fea9b7a2f8dbb6aa': New attempt at fixing mac build.