[automerger skipped] [automerge] Fix NPE 2p: 18179a8762 am: 789aab93bd -s ours am: 4102d87f47 -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 07e31dfb1e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592146
Change-Id: I4796f6d4bb13aa1a4fbfcb1e1c0ad6cfa2c6d9c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
committed by
Automerger Merge Worker
commit
a29c8c45f7