diff options
| author | 2023-08-08 05:24:48 +0000 | |
|---|---|---|
| committer | 2023-08-08 05:24:48 +0000 | |
| commit | 513607970aaf854820b6f2479dafced0e3b659f0 (patch) | |
| tree | 8439036a656577f09b285470caa9712377fe84bf /libs/androidfw/StringPool.cpp | |
| parent | 6eb889b4d0167cb9f07ea5d106d883c3478914b7 (diff) | |
| parent | a8f2442c7813a20d3eaa2a6dc1fe989623d9347e (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into rvc-dev am: c1aa2bb360 -s ours am: 26068ce874 -s ours am: 4d517b4865 -s ours am: b1e88e3d2e -s ours am: 34cb892a71 -s ours am: 08f1a5c82f -s ours am: 32c0b78c54 -s ours am: b5c6f4f63e -s ours am: a8f2442c78 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483
Change-Id: I9e6c62e78c995cf44179163fde25c48ee1fcc6fe
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