summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Evan Rosky <erosky@google.com> 2022-08-04 03:53:28 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-04 03:53:28 +0000
commit2e763d31d225dbc0b56e3bfb0e5d3b47a4dfb54d (patch)
tree931cf3a9e8e52bbe9a0f8599bcad70770527883a /libs/androidfw/StringPool.cpp
parent2c6ac09bda73c0437803d903b840c9457b194244 (diff)
parentd7ae033815ca79fe213eed937df13690785975ab (diff)
Merge "Revert "Strip transition information from activityoptions once it is read."" into sc-v2-dev am: 1099b25b2d am: d7ae033815
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19517194 Change-Id: I75303fa1000a2a5ca6233daa8c75fbcdce1238ba 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