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