summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-08-10 10:31:41 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 10:31:41 +0000
commit5f48d8bdd3a6b9dd1f50d9ffaa42d4bd16e08d47 (patch)
tree2b00da0619f7c8a8fb6636897806b02492736f4b /libs/androidfw/AssetsProvider.cpp
parentebb3827d36ac3e6e111456977f911783362bc8d2 (diff)
parentf677a899c9c2229efd959631d4f6e0ad99f6e3a1 (diff)
[automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into sc-dev am: d624bcc0cd am: 4d31f38909 -s ours am: bb0c06332f -s ours am: 0dfcb15f34 -s ours am: f677a899c9 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537073 Change-Id: I1497f79127c823b44af87cd4c3df956c329e4708 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