summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Chris Li <lihongyu@google.com> 2022-04-25 03:23:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-25 03:23:00 +0000
commitfc27dffd07c399cac6b72fb7af2f21351c8495ee (patch)
tree9644c9e27a667245b30a992652d6cc295eee8817 /libs/androidfw/StringPool.cpp
parentc08f429618b6df1bb331d74c22d32a2df96f2eb8 (diff)
parent849cb51470fdb8e3522d6f2cbeba21b4ab55814d (diff)
Merge "Fix transition wait when ActivityEmbedding enters PiP" into tm-dev am: 849cb51470
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17801185 Change-Id: Ie7c657e41ba85ce62e88bf7d01d07b62d8e9b423 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions