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