diff options
| author | 2023-08-08 01:37:34 +0000 | |
|---|---|---|
| committer | 2023-08-08 01:37:34 +0000 | |
| commit | d21ca32265b18fac00f739d50fdb0ac0a1a54305 (patch) | |
| tree | a90e4cf5dd41c1e703b48306c317851ccbf9d468 /libs/androidfw/ObbFile.cpp | |
| parent | c2c6cdd1cdad461e21091559b006d984b90d7b30 (diff) | |
| parent | a1797b3310c8ff22161d1fe67a0f6bf5e3c3ada7 (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 skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300600
Change-Id: I879e40134af03e1c43b8c410c0a563531a6261aa
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