commit f763cd121949dabef2b2151981b998d3943ad2b9
author Christophe Pinelli <cpinelli@google.com> Mon Jan 16 05:38:17 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jan 16 05:38:17 2023 +0000
tree f886944ca411538eff7bc2fdd61a97b0568da183
parent 82331bc219e2aafd4682809ec3bb25d27b7aa583
parent d6a8732985848bf3eb17f6669ff8442f58ee013c

[automerger skipped] Merge "[DO NOT MERGE] Fixing CTS failure caused by ag/20834743, the bundle now contains a key, thus it can no longer be null." into sc-dev am: a0b0b12ad5 am: 5fb2b50897 -s ours am: 446dfc4629 -s ours am: ca32f51a9a -s ours am: e07441289a -s ours am: 2fea4df2cf -s ours am: d6a8732985 -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/cts/+/20953359

Change-Id: Ie363006c59700094717f118e5b03dcfc195f4115
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>