| commit | b21b590af08deafe31581085add205c6d48728e0 | [log] [tgz] |
|---|---|---|
| author | Bill Yi <byi@google.com> | Sat Sep 19 07:01:26 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 07:01:26 2020 +0000 |
| tree | 9d0962be0393f60c890bf4e5cec1725db270db42 | |
| parent | d0dc08541aab05b3b18c7167fd4b31bfb204b3df [diff] | |
| parent | e4cfdfc48e5148a28a7908a84c979dc4d1bdeeb2 [diff] |
[automerger skipped] Merge "Merge mainline-release 6664920 to master - DO NOT MERGE" am: a0ad1c6b11 am: 6e5c861b5b -s ours am: e4cfdfc48e -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: I5e94d7b120917df0929c85c83d4127bac14fcf98