summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Robin Lee <rgl@google.com> 2023-09-12 04:44:17 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-09-12 04:44:17 +0000
commit766b6a9bd4d18630bdb8d7c5d32bcdcb1813819b (patch)
tree62937d3f77a5dce418f22a97a71aad5ebd2cbb87 /libs/androidfw/StringPool.cpp
parent381a16ce509d0b742e6d51887dcb41bd8e1db903 (diff)
parent6f6fee78a3446276fe46b301ce28877ce1ec6075 (diff)
Merge "Don't skip resume on transient-launch activity" into udc-d1-dev am: bc12ac9437 am: d8c72d93c1 am: 6f6fee78a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24704763 Change-Id: Ieeb979bee29663579404d995155e6817bff8b9e3 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