summaryrefslogtreecommitdiff
path: root/libs/androidfw/StringPool.cpp
diff options
context:
space:
mode:
author Bernardo Rufino <brufino@google.com> 2022-03-25 17:02:09 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-03-25 17:02:09 +0000
commit4e9903c3f6c92d1929b69d06992f91642e021aca (patch)
tree49bc5ace19140043fd82c73cfe63ccdf35bcc44f /libs/androidfw/StringPool.cpp
parentbb2a42d9d52d5c41193690317b621cdeda52625d (diff)
parent28edb92e7a16e07eebc89b71bc4a4b8f66c9891a (diff)
[automerger skipped] Merge "Cap alpha to max if SAW + FLAG_NOT_TOUCHABLE" into sc-v2-dev am: 5bc80b693d -s ours am: 28edb92e7a -s ours
am skip reason: Merged-In I3a74e1cc43a36171ee10fbf68c4bfff538eee661 with SHA-1 a451d5bae2 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071470 Change-Id: If95e96c4a9267d2de2d161dd9dc737c23622f622 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