tree ca3e198c3fe37c7fe2ad6e4c51f2956b87b7328f
parent 0b21b97d570c3e900d307b8716b99166b7e29ded
parent b74c7cbb9d808a5d452f9a68febe430af8a9c9c1
author Pinyao Ting <pinyaoting@google.com> 1664837218 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1664837218 +0000

[automerger skipped] [Do Not Merge] Ignore malformed shortcuts am: 9b0dd514d2 am: f67179a1ff -s ours am: 0750f90369 -s ours am: b74c7cbb9d -s ours

am skip reason: subject contains skip directive

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

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