summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-11 18:37:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-11 18:37:59 +0000
commit8dcf8376e0ea285d3d92c8e7024aa8912348db73 (patch)
tree4ca433b226945b781075c8c66f626f93927dd721 /libs/androidfw/AssetsProvider.cpp
parent011c642e5088074cd3bfb7c8e8f6fc828ddec4a7 (diff)
parent9fd3c6f73996f333eb757ca67e5502ccc4953bda (diff)
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Do not send new Intent to non-exported activity when navigateUpTo" into qt-dev am: 750c978db5 am: b302dca798 -s ours am: 192f2e6360 -s ours am: 201e93d899 -s ours am: e16f53a4f4 -s ours am: 9fd3c6f739 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948 Change-Id: I88576d3f1053d6e631f31d87e0fa2ce001dbe9b9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetsProvider.cpp')
0 files changed, 0 insertions, 0 deletions