commit | 4c7494434719fa218eef3c3e72c98777b7407d11 | [log] [tgz] |
---|---|---|
author | Nicolas Geoffray <ngeoffray@google.com> | Tue Oct 20 12:03:02 2015 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Oct 20 12:03:02 2015 +0000 |
tree | 8e0831ff94c789fe6b26e8d85d0716a589603c24 | |
parent | 7d0b641e67250fbe7092db673413d7e54d6f206b [diff] | |
parent | 1f4714010136bf4fcdc45f733324462551549b96 [diff] |
Merge "Fix mac build." am: 4206af2185 am: 1f47140101 * commit '1f4714010136bf4fcdc45f733324462551549b96': Fix mac build.