commit | 12563a0b8bd2fd5050e6360a46c65aa1ca053403 | [log] [tgz] |
---|---|---|
author | Dan Willemsen <dwillemsen@google.com> | Mon Jun 13 23:37:47 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 13 23:37:47 2016 +0000 |
tree | 26736cf251e9d37f44f873442fc6b1f1050d8546 | |
parent | fc450e94bb1aaa92bae0b57de102ec66b66b40c0 [diff] | |
parent | 6b4941798397a6338cbdb4478a7b1ee90bc052eb [diff] |
Merge \\"CtsShim: Support building with tapas\\" into nyc-dev am: c47168d592 am: 6b49417983 Change-Id: I0bcaed331650bd7ac022d1f2d1bbea817c33b4e5