summaryrefslogtreecommitdiff
path: root/libs/hwui/HardwareBitmapUploader.cpp
diff options
context:
space:
mode:
author Evan Severson <evanseverson@google.com> 2022-06-04 00:36:00 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-06-04 00:36:00 +0000
commit16f54919d504ca7fe8bb420c0c44bbb3cf0e1869 (patch)
treeb3c3b0554ef54c6b198b0057202a3bff05640a16 /libs/hwui/HardwareBitmapUploader.cpp
parent044f0a605f74de30e0bf9fc8f894c88b71d07507 (diff)
parent0d49574c94d4a5bcd392bd5a42ab9a347821c2e5 (diff)
[automerger skipped] Merge changes from topics "b231496105", "presubmit-am-7c6d0c599e7f4dbf9be275fe29d6dacd", "presubmit-am-ab0d3cb4d9224b16a38358ce19cfc908" into sc-dev am: 44893b71c0 am: 500d27a12c am: 0d49574c94 -s ours
am skip reason: Merged-In Idcf5ac9a5401ad8089f5873da1f978fdf9258b5a with SHA-1 61c2d0291b is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18496484 Change-Id: Id1f97aaa3b83423b0bc18f46e907d1f9c2973d0c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs/hwui/HardwareBitmapUploader.cpp')
0 files changed, 0 insertions, 0 deletions