tree f475b351ea33791c797969140260722a688ab9dc
parent 8efeda0bd0f22893820f383eb4b3fc23e3ebe9d2
parent e7498c23b58d8f6c9a318134f0e1d8d590e9fb54
author Merissa Mitchell <liyingtan@google.com> 1672808725 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1672808725 +0000

Merge "Rename caption resources for Desktop mode." into tm-qpr-dev am: 65e129f2eb am: e7498c23b5

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

Change-Id: Ie75469c4ce49e2c0b5ad2ee388a24c6f5674204d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>