[automerger skipped] [automerge] Fix NPE 2p: 73d533592a am: 7d7e98d2e9 -s ours am: 112618e2a7 -s ours am: 75899a4679 -s ours am: 68e256deea -s ours
am skip reason: Merged-In Ia21323926bd9db1a6f05461904deb45b4c3dd0bc with SHA-1 f562aadd77 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17592027
Change-Id: I82fbb1498f96272b03b9835b2a497e5c36b71199
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
384136f120