tree 12b93d935dfd23498c02f2e547cbf40b5241ca18
parent 0e9b5961c396c7453c6b0be37f644ce6909a2479
parent 3bab94ce54b8499df53c420a81e0ff734175f43a
author Julia Reynolds <juliacr@google.com> 1663884659 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1663884659 +0000

Merge "Fix NPE" into qt-dev am: 261b601d25 am: 23ffc379fe am: bdb417dc04 am: 6a00b13417 am: ddaa966ca6 am: 3bab94ce54

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

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