commit | 613a6c47c1a4ab3783221e4de8f29185bf1acfcb | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 08:01:03 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 08:01:03 2020 +0000 |
tree | 9d0962be0393f60c890bf4e5cec1725db270db42 | |
parent | e8b798e41ace5cb083c91ef44f6bedde5a165109 [diff] | |
parent | d0dc08541aab05b3b18c7167fd4b31bfb204b3df [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 27c07910ff am: 3877bc308d -s ours am: 62834ba828 -s ours am: d0dc08541a -s ours am skip reason: Change-Id I583836eeeaf604391ed9b1196d4b41e872dc635d with SHA-1 efc4c754ae is in history Original change: https://android-review.googlesource.com/c/platform/cts/+/1430784 Change-Id: Icf427f931b80054abbb27cb3310c8332176124e5