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