summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Evan Severson <evanseverson@google.com> 2022-08-11 01:32:02 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-08-11 01:32:02 +0000
commitd7dae129d5b2574cc9047325e4b7f0190ec9b019 (patch)
treee7d6a47fbb5602a201e0b4b1d4be1028740ec76f /libs/androidfw/StringPool.cpp
parent0d9dd2d13c3951ebc7bca5d13c8915abbc1e022e (diff)
parent551d1b852985f01c8f2ed46a9477d20be970baa8 (diff)
[automerger skipped] [automerge] Revert "DO NOT MERGE: Revert "Make CheckOp return allowed if any..." 2p: f21335c469 am: 0440b6851b -s ours am: dee4feed74 -s ours am: 551d1b8529 -s ours
am skip reason: subject contains skip directive Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19441568 Change-Id: I2126bc19f7cf28fbb18902c783531d8901e76c4c 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