tree 5cadf78d7343784029c97535bce073461aad35d1
parent dc89811bc9b469cb20e03fe9031f31007ae5af8a
parent 3f7fa9eb3a05779b8c49f6bcd9f2fe26cc2195ac
author TreeHugger Robot <treehugger-gerrit@google.com> 1601051324 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601051324 +0000

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

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

Change-Id: Ifb48dacc52190843c9dfac3a885ea150d8c71721