diff options
| author | 2023-03-23 20:32:07 +0000 | |
|---|---|---|
| committer | 2023-03-23 20:32:07 +0000 | |
| commit | a86a2a140769b56d1bd80afd5c6798774f565df7 (patch) | |
| tree | 2206a171dd6a9539e29b2088c3846e5b6e288230 /libs/androidfw/ObbFile.cpp | |
| parent | 7d0fd3b3808f190b5128f03fb7a7fad2cb57a2b8 (diff) | |
| parent | 80618adc8757cdcbd4988c253119cf6bb7013a4f (diff) | |
Merge "[automerger skipped] [automerge] Grant MANAGE_USERS access to Traceur 2p: f42db15239 am: 77f1d2a2ca -s ours am: 5725760416 -s ours am: b6ac32ca64 -s ours am: 575c485ca1 -s ours am: 0a2b74c553 -s ours" into tm-qpr-dev-plus-aosp am: 80618adc87 -s ours
am skip reason: Merged-In I481c95fed4a364239f0671ed1b4d9bfaa0b07bd6 with SHA-1 1009c53411 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22142967
Change-Id: I377cd7ab8c92202450107ca337082c72b6f23303
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