diff options
| author | 2023-08-08 02:23:10 +0000 | |
|---|---|---|
| committer | 2023-08-08 02:23:10 +0000 | |
| commit | 67f3e8b1f8ac0247c6358f0582afb2ee9908febd (patch) | |
| tree | 88d43b4fcdd60404bcdd70214c9bb8e534846a12 /libs/androidfw/ObbFile.cpp | |
| parent | 6beb3615bdcb123aa9e344897cf78241c5f5b3b0 (diff) | |
| parent | b68fc24119b3fc80a422e5a24ef006896a8990f0 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 8c2d2c6fc9 am: b68fc24119 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063
Change-Id: Iee3b92883a7c44b52073ab2989a9b7845e37a7d1
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