summaryrefslogtreecommitdiff
path: root/libs/androidfw/ObbFile.cpp
diff options
context:
space:
mode:
author Aishwarya Mallampati <amallampati@google.com> 2023-06-07 00:23:27 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-06-07 00:23:27 +0000
commitd0fa7c0b36d2df8c5db9bbae86ab2366513cbaf9 (patch)
tree71aaa4d2e75ac3c8060a63ee5b7315c028bad637 /libs/androidfw/ObbFile.cpp
parente0d266c5bb2f3060880ded696df644c8b4e9a179 (diff)
parent15720500ecfe197c9f4b5337cc69ecd8cd8253c5 (diff)
[automerger skipped] Merge "DO NOT MERGE Grant carrier privileges if package has carrier config access." into rvc-qpr-dev am: 3a9e1c2bc1 -s ours am: 82c20b69ce -s ours am: 7f16e54187 -s ours am: 9cdde1b1cc -s ours am: 5b1db02d86 -s ours am: 15720500ec -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20335897 Change-Id: I49b23f9b162a2e882cb0fc97f55fd7a7ac6b33a1 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