diff options
| author | 2023-08-08 02:16:48 +0000 | |
|---|---|---|
| committer | 2023-08-08 02:16:48 +0000 | |
| commit | e7ef06df7064339626ef013b1085fd5ed8e5eadb (patch) | |
| tree | 95306a0149591da336f01a8a60f67f58d17d780f /libs/androidfw/ZipFileRO.cpp | |
| parent | 3029dc01e5194a5890548a079ff057b3a83fc09a (diff) | |
| parent | 7d29675ebdc70459a46cd9e6fce76373d59e86a0 (diff) | |
[automerger skipped] RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets am: f0f020c21f -s ours am: 3b8290a881 -s ours am: 7d29675ebd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301483
Change-Id: I3547f7fd4a2aa361c65d57ae59c1c4f9a92aabfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ZipFileRO.cpp')
0 files changed, 0 insertions, 0 deletions