diff options
| author | 2023-08-08 05:23:14 +0000 | |
|---|---|---|
| committer | 2023-08-08 05:23:14 +0000 | |
| commit | d8dbc6f22c371792249233b0bdf853eec0bc01dc (patch) | |
| tree | 8439036a656577f09b285470caa9712377fe84bf /libs/androidfw/StringPool.cpp | |
| parent | a74277280761c8a2b79405f7728956f239fff4c9 (diff) | |
| parent | 29d509a9d593d54864620fd10201ac437e4b74ac (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-dev am: a3886a3f27 -s ours am: e8b3781508 -s ours am: 0ee52eca70 -s ours am: 6beebebf10 -s ours am: b7af8b41fd -s ours am: e39b390b82 -s ours am: 29d509a9d5 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301239
Change-Id: Ifac70d964033f2ec611847da080e5a7b4235440f
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