summaryrefslogtreecommitdiff
path: root/libs/androidfw/AssetManager2.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-12-01 21:00:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-01 21:00:12 +0000
commit7d8971f8ee5fb6b0ad3bbb7a5be62c23d470f7c2 (patch)
treeb57875885387f71b05ff62655c43ca3dc2baf455 /libs/androidfw/AssetManager2.cpp
parentde76b10769dc19794f525892c1afd8b9e1729434 (diff)
parentd6916b94da15d40c37199a3bdb5863f8469a3fa7 (diff)
[automerger skipped] Merge "Use rule package name in addAutomaticZenRule; specify "android" for all system apps" into rvc-qpr-dev am: e0b757e653 -s ours am: b7fb1dd4d7 -s ours am: 62dec4d801 -s ours am: e37c182f25 -s ours am: 2fe7dc1b8a -s ours am: 7ca3ad47aa -s ours am: d6916b94da -s ours
am skip reason: Merged-In I0c4c705cfe5fc875151958957daaf8657fbc21a7 with SHA-1 6e34748bdc is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20514843 Change-Id: I493ad922415e43d5843bba69bed3c77e2881d67b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/AssetManager2.cpp')
0 files changed, 0 insertions, 0 deletions