commit | 78d99554b15ec88a971c7504eccabcd272f90c49 | [log] [tgz] |
---|---|---|
author | Nicolas Geoffray <ngeoffray@google.com> | Tue Oct 20 21:37:53 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 21:37:53 2015 +0000 |
tree | 2e0ddb3ac5f59e714d48c5693de8d04df91ce2a8 | |
parent | 49a25b69a7ddd5c07cf202590576f0e2f567e314 [diff] | |
parent | 4c7494434719fa218eef3c3e72c98777b7407d11 [diff] |
Merge "Fix mac build." am: 4206af2185 am: 1f47140101 am: 4c74944347 * commit '4c7494434719fa218eef3c3e72c98777b7407d11': Fix mac build.