tree d6fe44678df7f253494abb46b3e946067f9b9a1d
parent 9e6bf224171d86068bc8525071ee660c074ad3a5
parent 4f7a659aca4a845772d162ea82607c1025737a0c
author TreeHugger Robot <treehugger-gerrit@google.com> 1591985417 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591985417 +0000

Merge "Controls UI - Tap for NO_TEMPLATE" into rvc-dev am: d6fb5e2151 am: d7c6a998a1 am: 4913eb2f6b am: 4f7a659aca

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

Change-Id: I469805c9dafe41f1444017b7b8b6cde005b71682