summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetsProvider.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-12-01 19:54:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-01 19:54:13 +0000
commit4ced543a5d3cdf23acd3a9cc2d9790bba886f27e (patch)
tree72574014025e2a52fcf2a941df518ac722453848 /libs/androidfw/AssetsProvider.cpp
parent23ed76a7936912355650bcba5e529003c9bd5a95 (diff)
parent2e55c7c46fc8fe78de471c4cf69fbe599119c459 (diff)
[automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into rvc-dev am: 177cff5975 -s ours am: b44e95c6a0 -s ours am: 4c144d569e -s ours am: 64c4cbbcb7 -s ours am: 55f0d8adf1 -s ours am: 2e55c7c46f -s ours
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 b5ec639ba2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20527082 Change-Id: Ibe809a0b8d967828a996846fc3b27c15c30bff35 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