tree 181044076c521b5e2a205d8cd63eeba778feb475
parent adc51348631bb293f680dbe2448b56407f856e93
parent 42875c3a99aa606ca9026f261207204e16026482
author Treehugger Robot <treehugger-gerrit@google.com> 1594173343 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594173343 +0000

Merge changes from topics "pc-enum", "pointer_controller" am: 42875c3a99

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

Change-Id: I359f1393852de5df2c6d93115a4d971d9b6c3d0c