tree 6f7ccf8c2c18aa05aa9f48fb246fe6ffd512705e
parent 229c6350340b5142f023d26dee42e426f0db2c2a
parent 95d5f3fd64b7dffe4df65fc33df8de1e868af91b
author Presubmit Automerger Backend <android-build-presubmit-automerger-backend@system.gserviceaccount.com> 1663870602 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1663870602 +0000

[automerger skipped] [automerge] Fix NPE 2p: e51c402650 am: 89439d1cbc -s ours am: de299cab0f -s ours am: 95d5f3fd64 -s ours

am skip reason: Merged-In I9c681106f6d645e62b0e44903d40aa523fee0e95 with SHA-1 c23f14f874 is already in history

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

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