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