summaryrefslogtreecommitdiff
path: root/libs/androidfw/ApkParsing.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-07-12 18:05:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-07-12 18:05:32 +0000
commit5909b534c658d415ac466e9f49b97bb80696850f (patch)
tree794ded494fe48ae48a115fdae1b2ac15df4ad3c3 /libs/androidfw/ApkParsing.cpp
parentf446443067fa7abe095fe332b9990093ed69a333 (diff)
parentbfc270920de8dce02dd8e9f8d21685dbeb131648 (diff)
Merge changes from topic "am-1b9e8ba39c5043f49190384b51db718c" into udc-qpr-dev
* changes: [automerger skipped] Merge "[DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews" into sc-dev am: e352025e4e am: f400399f98 -s ours am: 1c131dec51 -s ours am: 5043dedfc2 -s ours am: 3f6325f2bd -s ours am: d178c584af -s ours am: badd257ed1 -s ours am: 19e5fd9744 -s ours [automerger skipped] [DO NOT MERGE] Verify URI Permissions in Autofill RemoteViews am: 73fa082a72 am: 07537213c4 -s ours am: 30339eadee -s ours am: 1a2e83284f -s ours am: 36509273bf -s ours am: fa2c088ef3 -s ours am: 0fb8a53016 -s ours am: 9e0cb468b1 -s ours
Diffstat (limited to 'libs/androidfw/ApkParsing.cpp')
0 files changed, 0 insertions, 0 deletions