diff options
| author | 2023-08-08 02:26:11 +0000 | |
|---|---|---|
| committer | 2023-08-08 02:26:11 +0000 | |
| commit | c0a5820b50ed7e6db2ff3ed58096f7b058d665dc (patch) | |
| tree | 88d43b4fcdd60404bcdd70214c9bb8e534846a12 /libs/androidfw/ObbFile.cpp | |
| parent | aee7da70e4665e7e4c3830fe6b6690edc98b7f00 (diff) | |
| parent | d21ca32265b18fac00f739d50fdb0ac0a1a54305 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-v2-dev am: d57db27a1f -s ours am: a1797b3310 -s ours am: d21ca32265 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: Iba894908b1d0d3b9703d7bfc72742a5b9d43e0bb
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