diff options
| author | 2023-08-08 05:23:03 +0000 | |
|---|---|---|
| committer | 2023-08-08 05:23:03 +0000 | |
| commit | a74277280761c8a2b79405f7728956f239fff4c9 (patch) | |
| tree | 8439036a656577f09b285470caa9712377fe84bf /libs/androidfw/StringPool.cpp | |
| parent | b176861ffa427205ba3c433a00e0cff87d43ecb8 (diff) | |
| parent | 160e2e2f274bd1786bb4392ac62a373a476f6274 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: 30d1770dbf -s ours am: b316efb721 -s ours am: 61bc051bfb -s ours am: 6b25ef9fef -s ours am: c680209d34 -s ours am: fe28a5d336 -s ours am: 160e2e2f27 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301239
Change-Id: I86071793ebbfab2f87e38f2b0facbb8aff8dd695
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