tree 825836ab1b251950204767ac1f392e203fc7dc0a
parent e999adb0b4c55c30536e9c49e78022b971c25d5b
parent 15d1fb6a22a408f22004d174c35c61c9259d7748
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583964730 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583964730 +0000

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

Change-Id: I09c76ff6fec4f0e0795b7502a547c3faeb3fb010