diff options
| author | 2023-08-08 03:24:14 +0000 | |
|---|---|---|
| committer | 2023-08-08 03:24:14 +0000 | |
| commit | 58bfb0db35125727c5969f57237a6071a2e317a0 (patch) | |
| tree | 9ab16c6c33636400fd8741b20ab26c6630f02c47 /libs/androidfw/ObbFile.cpp | |
| parent | 58e9ce3e948addd94ca3fd66e42fb40e5c7b7437 (diff) | |
| parent | 201bb40d90b389cdab52f1035eb86b95b7cb5c4e (diff) | |
[automerger skipped] Merge "RESTRICT AUTOMERGE: SettingsProvider: exclude secure_frp_mode from resets" into tm-dev am: 65b97b1586 am: 677b43cbc7 -s ours am: 32cd68e6ea -s ours am: 201bb40d90 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24301063
Change-Id: Ibc5867962ea0585310bec9985354ce61e482d963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ObbFile.cpp')
0 files changed, 0 insertions, 0 deletions