summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author TreeHugger Robot <treehugger-gerrit@google.com> 2022-08-11 18:12:57 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-11 18:12:57 +0000
commit9fd3c6f73996f333eb757ca67e5502ccc4953bda (patch)
tree6f72e318a762569e9a71e6131c05a918e59d9e90 /libs/androidfw/AssetsProvider.cpp
parentea1b568787e472ba82c613644fc1d7851824c602 (diff)
parente16f53a4f46f8d17cf8a5ba2bce791757fb9040d (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19518948 Change-Id: Ia5b704e172b650574f1a3bde72028557826d47a2 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