commit | f5f53c1a70a3272434de36b751b9a15269c44ebc | [log] [tgz] |
---|---|---|
author | Brett Chabot <brettchabot@google.com> | Mon Apr 15 16:29:34 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Apr 15 16:29:34 2019 -0700 |
tree | 14b18c24c2062217cb458d5f1037cb65763c6ec0 | |
parent | 21f55f00fe3fb2c266741c743d177c625743b585 [diff] | |
parent | 6e64b1a56d013639582a321b35ddfa931acb4173 [diff] |
[automerger skipped] Merge "DO NOT MERGE Fix CtsNdefTestCases, CtsSystemIntentTestCases" into pie-cts-dev am: 2ada6d1ec4 -s ours am: 6e64b1a56d -s ours am skip reason: subject contains skip directive Change-Id: Id541ea3f5b84eb9e8f1d8589aff3278fe5e3d0fc