summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Linus Tufvesson <lus@google.com> 2022-08-10 09:45:26 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-10 09:45:26 +0000
commit489a72df1d19b4d100b8071c263dc32173f4de00 (patch)
tree20ec6ca307552a50fd2ed080192d4426e15e5eb6 /libs/androidfw/AssetsProvider.cpp
parentb73401ec784b9886eb0457ea1be4f489348b6569 (diff)
parent84dc77df0f80bcbfc7f23280a1408daf1851a5fe (diff)
[automerger skipped] Merge "DO NOT MERGE - Exclude TYPE_PRIVATE_PRESENTATION app visiblity" into sc-dev am: d624bcc0cd am: 015642ea66 -s ours am: 84dc77df0f -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19537073 Change-Id: Ic75282d9ac78e572f4fa437767c297f43c56bf10 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