tree 0d5949b3b5e942fdde9d82d419e53ea5492fc2a3
parent 5ae197cb8f7637bbf8adf9aad1a4156e44004ad4
parent 8d53c79a02fda40ca858543806de8d9ff16e9c35
author Charles Chen <charlesccchen@google.com> 1594231782 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594231782 +0000

Merge "Fix NPE when invoking Context#isUiContext" into rvc-dev am: 5c25605da0 am: 8d53c79a02

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

Change-Id: I2fed3e587f6d93ee9e68b01235e84dd725e4d4bb