diff options
| author | 2023-08-08 04:32:52 +0000 | |
|---|---|---|
| committer | 2023-08-08 04:32:52 +0000 | |
| commit | 7718d7a5851c7fcea8bbd34f5109e5c1762084d5 (patch) | |
| tree | 4cb7fba5e37a583620a447a28828ac54e58e632a /libs/androidfw/FileStream.cpp | |
| parent | 351994fadabc1ebadfe6da8e34ab8d19df93a4b0 (diff) | |
| parent | 693a6c22cc66f5dc5d2517f36ea7619b984b1e2e (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: 693a6c22cc -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301360
Change-Id: I27f0fa9b283907723d328d7746e1484a2c51b32c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/FileStream.cpp')
0 files changed, 0 insertions, 0 deletions