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-03-17 20:25:40 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-03-17 20:25:40 +0000
commit285e4fe0a1c9fbd491aadd8cf28ef27893cb5ce8 (patch)
treed666f75422b424bd26787d0b2a4a82a01f038e3a /libs/hwui/HardwareBitmapUploader.cpp
parent54635bfa967f4306c19fbf32174d5e26fd5d1c54 (diff)
parenta8ea58635ecfe3d759416a14a6350ab27fea3989 (diff)
[automerger skipped] Merge "Update ConnectivityDiagnosticsCallback function name." am: 35cba128cb am: ee0f856d32 -s ours am: 1365b22e55 -s ours am: 292ddf563f -s ours am: a8ea58635e -s ours
am skip reason: Change-Id Ieea727ecee6cf358a53a215fd4b06233dfe967ea with SHA-1 9347e33557 is in history Change-Id: If5aeb21a71e9e955a75dd2da8cb7b41dc4033403
Diffstat (limited to 'libs/hwui/HardwareBitmapUploader.cpp')
0 files changed, 0 insertions, 0 deletions