summaryrefslogtreecommitdiff
path: root/libs/hwui/HardwareBitmapUploader.cpp
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-06-14 05:47:42 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2020-06-14 05:47:42 +0000
commit888b803786f4891e4e625673cc8b736d1fff193c (patch)
tree91811a0ae2fc41f1cfc7b3233c0b6e6906daf5e5 /libs/hwui/HardwareBitmapUploader.cpp
parent30125eeac7bb6403ebb48e28a142ea70e3037c48 (diff)
parent02436d1775b545120818f6ebca04fa1909cd2a89 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 96860e0ecc -s ours am: 41369c7d65 -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'libs/hwui/HardwareBitmapUploader.cpp')
0 files changed, 0 insertions, 0 deletions