summaryrefslogtreecommitdiff
path: root/libs/gui/BLASTBufferQueue.cpp
diff options
context:
space:
mode:
author Bill Yi <byi@google.com> 2021-01-06 14:43:20 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2021-01-06 14:43:20 +0000
commitc1afad7855dd5821069f71c921baa2f9d6d8df29 (patch)
treef519ca1f8307304c63770560c2045c80d6d4f2be /libs/gui/BLASTBufferQueue.cpp
parentbd4448ef0c51bf030bf567895a2c6a43be290ba1 (diff)
parentf8ba311c06ec6411defc1607c8c68cee853562fc (diff)
[automerger skipped] Merge "Merge RQ1A.210105.003 to aosp-master - DO NOT MERGE" am: 8e9e176429 -s ours am: f8ba311c06 -s ours
am skip reason: Change-Id If00554d9b0cd56b3c7d91acbab96708de34a18f4 with SHA-1 4e407a9442 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1541005 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idd03849bf4b6d2178abdf01ed2becd1ae2fa7aaf
Diffstat (limited to 'libs/gui/BLASTBufferQueue.cpp')
0 files changed, 0 insertions, 0 deletions