diff options
| author | 2023-08-08 05:24:04 +0000 | |
|---|---|---|
| committer | 2023-08-08 05:24:04 +0000 | |
| commit | 0bfee4e4ebabacde3d95c8a413254d3fa11990a0 (patch) | |
| tree | 8439036a656577f09b285470caa9712377fe84bf /libs/androidfw/StringPool.cpp | |
| parent | e4958824b3d4394d3f1474450d34546d9ca3e54b (diff) | |
| parent | 5e3c754e9a4c81a2ceb8e203146ad15e07043bb7 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-qpr-dev am: 6ff8b636ee -s ours am: 91c3b175ac -s ours am: 3029dc01e5 -s ours am: ed968a1c43 -s ours am: 324233db2c -s ours am: 91567e9b86 -s ours am: 0aaf5cf83f -s ours am: 5e3c754e9a -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360
Change-Id: I7ee2c01c11f09803f2ad150c569a692f3f615e90
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