summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Simon Wingrove <simonjw@google.com> 2022-10-20 08:49:21 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-10-20 08:49:21 +0000
commit4dffd5e72383a765554719a6ad10b225e354853b (patch)
treecb786665d7b3a3ee3e1994abc134e48c30b6cf33 /libs/androidfw/StringPool.cpp
parent5468b68694871cc9dbc5e9a748c69454092b45c5 (diff)
parentc54ac3e6d34e63ff5d70361cf9a45f4a112fc2c1 (diff)
Merge changes from topic "b253394518-back-button"
* changes: [automerge] Allow ActivityEmbedding in APEX modules. 2p: a4156b6f4d Allow ActivityEmbedding in APEX modules.
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions