tree 1a02ebc637aaa62078184063599f5e2f8e8d5d0a
parent 28894579aed5572aecf094333a345eb01bc5093c
parent 617f80257ded3cd2b2765debd3133a64dc4f6e8e
author Charles Chen <charlesccchen@google.com> 1629184085 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1629184085 +0000

Merge "Fix NPE in testWindowContextAddMismatchedWindowType" into sc-v2-dev am: 617f80257d

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

Change-Id: I82d0523ccc35ed738df5473bd35c4225673b17ea