summaryrefslogtreecommitdiff
path: root/libs/gui/BLASTBufferQueue.cpp
diff options
context:
space:
mode:
author Xin Li <delphij@google.com> 2021-08-13 23:32:30 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-08-13 23:32:30 +0000
commit31f16c5d71f4594cbd46ce33a95deb3b579415a1 (patch)
treea33bb958b28bfe349fd222b58c677b407925712f /libs/gui/BLASTBufferQueue.cpp
parentf7f64d56c3f0c2bb149fc481f5d41a60883ad741 (diff)
parent6afe536fbc56ed4f40b59ce1f49d197e20135175 (diff)
[automerger skipped] Merge stage-aosp-sc-ts-dev before making it an upstream am: 62d46ebc11 -s ours am: 32ca6e8190 -s ours am: 6afe536fbc -s ours
am skip reason: Merged-In I2a2d02a0d7e67ee9577857a210cb6157683e5598 with SHA-1 52846cd871 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/15550161 Change-Id: If8d528bb78ffc69c5bc7c25acf1590b3bc4ade1d
Diffstat (limited to 'libs/gui/BLASTBufferQueue.cpp')
0 files changed, 0 insertions, 0 deletions