summaryrefslogtreecommitdiff
path: root/libs/androidfw/ConfigDescription.cpp
diff options
context:
space:
mode:
author Nikolay Elenkov <nikolayelenkov@google.com> 2024-07-09 06:03:21 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2024-07-09 06:03:21 +0000
commit4baa6cb45702d62b10a13063f3e5153c2d4a51bb (patch)
treeb9410fa0d0ee235cdb2a2d5323fbf70a21c21e46 /libs/androidfw/ConfigDescription.cpp
parent10701d1e7f462b686046b09237e7225ef5d9ed45 (diff)
parent05fcd6da31aae30d9710b8e8423cf69ae68451b7 (diff)
[automerger skipped] Merge "RESTRICT AUTOMERGE Delete keystore keys from RecoveryService.rebootRecoveryWithCommand()" into tm-dev am: 205ffa2a8c am: 690d232e95 am: 4583dd90ee -s ours am: 05fcd6da31 -s ours
am skip reason: contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/28062211 Change-Id: I725aef159baad143ff1538b2c34550f03e029190 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/ConfigDescription.cpp')
0 files changed, 0 insertions, 0 deletions