tree 19ff5f230e18abdcf30a3b873328532615726428
parent a21450c03503946f4c4a1eef012eff0b2fb5d8db
parent ee55e5a34f80cb2f18aac39e46187984c3a44224
author Nan Wu <wnan@google.com> 1691089445 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1691089445 +0000

[automerger skipped] Merge "DO NOT MERGE Fix BAL via notification.publicVersion" into sc-dev am: 0f4454ce79 am: 92e29bc9e0 -s ours am: 283de987cb -s ours am: afc27392e6 -s ours am: cd37e1a15e -s ours am: a66bbfe998 -s ours am: 9fcd49f2e4 -s ours am: 3b4a0ff50d -s ours am: ee55e5a34f -s ours

am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23983543

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