tree 07a143811c04211bd6714282dd768ffa999da132
parent 4b630bbd412adb65fbbce14aa854eb930131ff0f
parent 70a4d6f738028d6def4c7f1a2bd1842f8cbf9c16
author TreeHugger Robot <treehugger-gerrit@google.com> 1601052183 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601052183 +0000

Merge "Guard aginst another NPE" into rvc-qpr-dev am: 3f7fa9eb3a am: 70a4d6f738

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

Change-Id: I5c5c95aeb1a095ebbbfa855e6aab50ba60ae6162