summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-12-01 20:58:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-01 20:58:40 +0000
commit3fbbfbec3fe98bdfba850d8ef03bc64c3fa256e9 (patch)
tree72574014025e2a52fcf2a941df518ac722453848 /libs/androidfw/AssetsProvider.cpp
parent4ced543a5d3cdf23acd3a9cc2d9790bba886f27e (diff)
parent90a0e261946e4bcb5388c4ea30f9f72cd8ad19dc (diff)
[automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into qt-dev am: e0ddfb666d am: fb7e019e1d -s ours am: a5b0e8c2e7 -s ours am: 853c9d7bb5 -s ours am: 713824873b -s ours am: 616553ab89 -s ours am: a988aef9b8 -s ours am: 90a0e26194 -s ours
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 7e58ab94f9 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20532079 Change-Id: I96bd5031b032590d4658c7dc632199f549e9a393 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