summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2022-04-25 21:06:58 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-25 21:06:58 +0000
commit23bba85984d36b57e383be6952074e775c0c2308 (patch)
tree5c4042a21059b0cb1636dbb93839d9879db6cb16 /libs/androidfw/StringPool.cpp
parent48b4a97457daf12850b3b764a13aa22de5c30ce1 (diff)
parentd2993fd33a97b28bb1fd9d7f89cfcb7f363f8662 (diff)
[automerger skipped] [RESTRICT AUTOMERGE] UserDataPreparer: reboot to recovery if preparing user storage fails am: ea010f3dd2 am: 245e455114 -s ours am: 00401eda09 -s ours am: 1fed4175e8 -s ours am: 00f6398e69 -s ours am: 9ebbc45594 -s ours am: 97df5e8b63 -s ours am: f601af78e9 -s ours am: d2993fd33a -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379 Change-Id: I057f66dc1e5fe100908bedd44c8582a8a706ee68 Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/androidfw/StringPool.cpp')
0 files changed, 0 insertions, 0 deletions