summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-11 15:40:55 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2022-08-11 15:40:55 +0000
commit54eb5e201bd73902bb8e5141872cbf577aa86ca2 (patch)
tree8227c5af307405eaabf801226ae857b240d6b173 /libs/androidfw/AssetsProvider.cpp
parent12d6101d26ce30e3365849206471d5c8822be5dd (diff)
parentf621ab18ab56f35912300cabe55fabdd7f409ded (diff)
Merge changes from topic "new-intent-navUp-sc" into tm-dev
* changes: [automerged blank] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 2p: 89ebc8c43f 2p: 92b3eb6795 [automerge] [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo 2p: 89ebc8c43f [RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions