summaryrefslogtreecommitdiff
path: root/libs/gui/BufferQueue.cpp
diff options
context:
space:
mode:
author The Android Open Source Project <initial-contribution@android.com> 2012-12-11 11:57:07 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2012-12-11 11:57:07 -0800
commit3a6efcb8ce5098a2817ac85a099ca23d4e2c8b47 (patch)
tree07a99dcb8fb1c21b0995f991f479859f25f39bd8 /libs/gui/BufferQueue.cpp
parent0e1e53e376ccb3c173ff8e5efeab39b2c5dfd6bd (diff)
parent0c6fff72f78e4f80b28ccccac9584255591dd1a2 (diff)
am 0c6fff72: (-s ours) Reconcile with jb-mr1.1-release - do not merge
* commit '0c6fff72f78e4f80b28ccccac9584255591dd1a2':
Diffstat (limited to 'libs/gui/BufferQueue.cpp')
0 files changed, 0 insertions, 0 deletions