summaryrefslogtreecommitdiff
path: root/libs/gui/BufferQueue.cpp
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2013-07-11 10:17:28 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2013-07-11 10:17:28 -0700
commit59a99aaad08e9d8163257ae67e562c69369d52a1 (patch)
treeb803d0b56902cc80ca152c3b1311e9af0162e0e0 /libs/gui/BufferQueue.cpp
parentffc791a9de44621b1dccaa8e1a987cdbca28a289 (diff)
parent9201798cd99d0578fb781aea03635304e49ee3f3 (diff)
am 9201798c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '9201798cd99d0578fb781aea03635304e49ee3f3':
Diffstat (limited to 'libs/gui/BufferQueue.cpp')
0 files changed, 0 insertions, 0 deletions