commit | a378587bcf57084cbb9a4b80e61ebe42ad58324a | [log] [tgz] |
---|---|---|
author | Colin Cross <ccross@android.com> | Sat Oct 22 08:01:46 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 22 08:01:46 2016 +0000 |
tree | 5181489ffafa78b2ee1f5ac58fa84a6e10a170ab | |
parent | 2543f91cde3face0f899329569231826cab7e54d [diff] | |
parent | c53581aea3135969826ea46ceee6c2c1239c87db [diff] |
Merge "Fix mac build" am: 058a64acf5 am: c53581aea3 Change-Id: Ic1df5a1e79e80a1db12a1775bf0977a0b03d4a49