commit | 62834ba82864c7dfeb59d835b9b0391b852b9b4a | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Sep 19 05:50:34 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Sep 19 05:50:34 2020 +0000 |
tree | 9d0962be0393f60c890bf4e5cec1725db270db42 | |
parent | cc3132bc743da525c7646b45c964af1ede0d42af [diff] | |
parent | 3877bc308d351a62c647e9a028268441396bfa74 [diff] |
[automerger skipped] Merge mainline-release 6664920 to master - DO NOT MERGE am: 27c07910ff am: 3877bc308d -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: I26581b97427542185ae461e7702ad5105e96026d