tree 1a5f6ab3d2315700c362a741b3486a9474257223
parent dd8485a80cb629f2a49305b94717b878050fb285
parent 76b221c84ba639bace27432cfa08ac1434941a80
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583964208 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583964208 +0000

Merge "WindowContext: Add @WindowType intdef" into rvc-dev am: 76b221c84b

Change-Id: Iba20dd9ca6cd28e3a4688ca2f18b01590a248500