summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Eric Biggers <ebiggers@google.com> 2022-04-25 20:41:59 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-04-25 20:41:59 +0000
commitf601af78e964299c05e7ef38035055bdd3011a8f (patch)
tree1199ea87cce6b313fc9d4a52324024314531ac4e /libs/androidfw/StringPool.cpp
parent9346eb8414501fbaf9ddae917e76bcf67b27dd78 (diff)
parent97df5e8b639a48f31e456d44dababc8aa37bf1f9 (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 skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17416379 Change-Id: I8d0a6720f3879d281decbe40d6a7dfa240e13df2 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