[automerger skipped] Merge "Fix NPE" into sc-dev am: 829b1e826e -s ours am: d2bce37d3e -s ours am: 5cccc67c1e -s ours am: 2385ad14fd -s ours am: 2e0c5af17c -s ours

am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 73d533592a is already in history

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

Change-Id: I0f3797eca4ab118a248d890ea3a51ab954750178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2022-04-06 06:52:08 +00:00
committed by Automerger Merge Worker

Diff Content Not Available