| commit | 38f6023e71d93961fb450967bb49f4026a2c3c00 | [log] [tgz] |
|---|---|---|
| author | Android Build Merger (Role) <android-build-merger@google.com> | Mon Jun 13 23:38:14 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Jun 13 23:38:15 2016 +0000 |
| tree | 26736cf251e9d37f44f873442fc6b1f1050d8546 | |
| parent | abbcae36e212da60d22c4bf61a875a57f1867f36 [diff] | |
| parent | 12563a0b8bd2fd5050e6360a46c65aa1ca053403 [diff] |
Merge "Merge \\"CtsShim: Support building with tapas\\" into nyc-dev am: c47168d592 am: 6b49417983" into nyc-mr1-dev-plus-aosp