diff options
| author | 2023-08-08 01:38:41 +0000 | |
|---|---|---|
| committer | 2023-08-08 01:38:41 +0000 | |
| commit | 00bf4456c3234c3ad55fab4d3bbf0723f5827e5f (patch) | |
| tree | a90e4cf5dd41c1e703b48306c317851ccbf9d468 /libs/androidfw/ObbFile.cpp | |
| parent | d21ca32265b18fac00f739d50fdb0ac0a1a54305 (diff) | |
| parent | 6b6765b146c75d569c3c0c94bdb765ea855a7b76 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 976fd54a43 -s ours am: 4306517b07 -s ours am: 6b6765b146 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602
Change-Id: I281d4a53024fa95833029014f0f3feb0ce3756cc
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