commit | 507cb69a78678d4bf0c5f62b58469c87d6ae11e3 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Sep 21 08:27:57 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Sep 21 08:27:57 2020 +0000 |
tree | fe3755b967ef1c5a403f2d0449a705e5b29856a4 | |
parent | cae82351f2d2b5b26dc9107b0daed6bfcf53c587 [diff] | |
parent | 967a3e32050709d5be24cc40ed666c2214c5bedb [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: 967a3e3205 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/cts/+/1430784 Change-Id: I19a5e0298723aea67a8ad4c02f15141302330a30