summaryrefslogtreecommitdiff
path: root/libs/gui/QueueBufferInputOutput.cpp
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2020-12-09 22:48:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-09 22:48:33 +0000
commit103af2efcd28ded16719897a98ff1d0c3b28a388 (patch)
tree4e96699000f1cc27ddc4c1f0372f4caccb396569 /libs/gui/QueueBufferInputOutput.cpp
parent46ee704792f16d509d6224c532cf85f8df8c6f2d (diff)
parent6a57433561b6d1f2b8c8bc77f9f37c2cdbdfef50 (diff)
[automerger skipped] Merge changes from topic "aidl-ndk-comparison" am: 370181de2d am: 44900ea50f am: 6a57433561 -s ours
am skip reason: Change-Id I3c112d0883c4d51fd5376709f3db4d72b6883697 with SHA-1 5001096eb6 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1519809 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibc6d583664b6f4cabacc9dba0822a01179550dca
Diffstat (limited to 'libs/gui/QueueBufferInputOutput.cpp')
0 files changed, 0 insertions, 0 deletions