diff options
| author | 2023-08-08 01:32:00 +0000 | |
|---|---|---|
| committer | 2023-08-08 01:32:00 +0000 | |
| commit | e8b37815080b897409de20f7d624276eceb9ceb0 (patch) | |
| tree | 95306a0149591da336f01a8a60f67f58d17d780f /libs/androidfw/FileStream.cpp | |
| parent | b316efb721a7af5ac7d9ba7be5877f31deeeb995 (diff) | |
| parent | a3886a3f274461e933826b8c4ab21f2628ffdcd7 (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into sc-dev am: a3886a3f27 -s ours
am skip reason: Merged-In Id95ed43b9cc2208090064392bcd5dc012710af93 with SHA-1 976fd54a43 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301239
Change-Id: I81bc96485ef756bc5dde28863101846aa2b476be
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