summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-02-28 22:04:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-02-28 22:04:27 +0000
commitd58b4422a5d2e7c0d3a58f5c8f66bb79da5ae298 (patch)
tree56c62c1504b6305693948e819d410612a94406e3 /libs/androidfw/StringPool.cpp
parentcc99b1d15308d288706fb492292de83acd5fe28a (diff)
parent42b2cec2d11733fe05e4e5f58a933bb6ebb74460 (diff)
[automerger skipped] Merge "Allowing launch cookies to be passed via pending activity starts" into sc-v2-dev am: 42b2cec2d1 -s ours
am skip reason: Merged-In I339ea827836fa53ab5bb1617a72f9e0e5ae0f5ec with SHA-1 30362a07af is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16968731 Change-Id: I6dcd336cb94e33bdc6145433b5a86b5f868a6c4a
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions