diff options
| author | 2023-08-08 01:37:27 +0000 | |
|---|---|---|
| committer | 2023-08-08 01:37:27 +0000 | |
| commit | c2c6cdd1cdad461e21091559b006d984b90d7b30 (patch) | |
| tree | a90e4cf5dd41c1e703b48306c317851ccbf9d468 /libs/androidfw/ObbFile.cpp | |
| parent | f75c650854ea0f1859ce895fe3f27d6ab60a00f3 (diff) | |
| parent | a242d36b8ce437fc37ad5f5d7ee6c32fdb6ae9f8 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: a7ea34724f -s ours am: a242d36b8c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: I8ef6d404772247d617806b16035bd24a100b76ee
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