commit | 4a11773b4e7d48d5f885b79e3237c508ec80a5f4 | [log] [tgz] |
---|---|---|
author | Dan Willemsen <dwillemsen@google.com> | Mon Jun 13 23:32:32 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 13 23:32:32 2016 +0000 |
tree | 26736cf251e9d37f44f873442fc6b1f1050d8546 | |
parent | 8781969a543a62a48de43755a8750cf7e8afbb04 [diff] | |
parent | 094a8439c9db388d48143fb35ce8227ef087c049 [diff] |
Merge \\"CtsShim: Support building with tapas\\" into nyc-dev am: c47168d592 am: 094a8439c9 Change-Id: Ie8fe37a78ce14157c5c66cec99b69175cc2dce79