diff options
| author | 2023-08-08 03:52:49 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:52:49 +0000 | |
| commit | f733e41b02ff29d0d77056fccb1b52cb588219ff (patch) | |
| tree | d72875ddd02a38f67dcb3d4629ea01f1ba7eb2c8 /libs/androidfw/StringPool.cpp | |
| parent | 8bc1504d13495b31152dbff747f9f18c242952a6 (diff) | |
| parent | 2a21ae463009798f6374337f2fdc0f93fa66cf64 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-qpr1-dev am: 2028c143ae -s ours am: 34cc50a453 -s ours am: 4876714be3 -s ours am: 53c0fc53a3 -s ours am: 1902369c71 -s ours am: 2a21ae4630 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24300602
Change-Id: I95528756eb536aba3d31f6e3b05660fdeade5085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions