tree 99ea564140f7c9211c7fe27221e645ddf4442205
parent 49698f5cb0dd8b95dab009a6eb7a4bff15dac17c
parent b26c104b457e8814f435a8ff3041cae54d6995b4
author TreeHugger Robot <treehugger-gerrit@google.com> 1610362064 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1610362064 +0000

Merge "Ensure OK/Cancel buttons always shown" into rvc-qpr-dev am: b26c104b45

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2099b50557604fa6e3dfc14a3fd8d4ba6b54fbc8