summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Yuri Lin <yurilin@google.com> 2022-12-01 19:12:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-12-01 19:12:20 +0000
commit616553ab892cae1584184836978d607cbee78ade (patch)
tree266949518100aec41e8cbc5802ae6dad67d6e2ff /libs/androidfw/ObbFile.cpp
parent64c4cbbcb7f661248420a2a2cafdd075d1b01752 (diff)
parent713824873b5b50d142bd86143ed8bebbf307bfbc (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 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: I4fc4b90778e4013d8dcc27cafc968a87c6c3d171 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions