diff options
| author | 2023-08-08 04:54:03 +0000 | |
|---|---|---|
| committer | 2023-08-08 04:54:03 +0000 | |
| commit | 29d509a9d593d54864620fd10201ac437e4b74ac (patch) | |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 /libs/androidfw/ObbFile.cpp | |
| parent | 160e2e2f274bd1786bb4392ac62a373a476f6274 (diff) | |
| parent | e39b390b82b668c3d9ee3442567ce45baca6b77e (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-dev am: a3886a3f27 -s ours am: e8b3781508 -s ours am: 0ee52eca70 -s ours am: 6beebebf10 -s ours am: b7af8b41fd -s ours am: e39b390b82 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301239
Change-Id: Iaee11ad56e44e44753456bcffed0827c57e54a7a
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