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