diff options
| author | 2023-08-08 03:03:08 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:03:08 +0000 | |
| commit | 201bb40d90b389cdab52f1035eb86b95b7cb5c4e (patch) | |
| tree | 88d43b4fcdd60404bcdd70214c9bb8e534846a12 /libs/androidfw/ObbFile.cpp | |
| parent | 13cbc11d04f025077e07efc937178bd25c80e52c (diff) | |
| parent | 32cd68e6eaed692222786831809bb82e42de4d65 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b1586 am: 677b43cbc7 -s ours am: 32cd68e6ea -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063
Change-Id: Ice6c8074eecd0e88fe0fb0b145df3bf52f7b50e2
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