summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2013-05-22 07:27:39 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-05-22 07:27:39 -0700
commitb352cec448530db8b4ba9f121d8ac9462702c1cf (patch)
treeae76e94dd21bd554b04478ed4ed2970bc2d2d5e6
parent6077b51013d935f626d430281c826d4ad5b8ba64 (diff)
parentcf2148e863e2fed037aa0793d2822d9898289f17 (diff)
downloadframeworks_av-b352cec448530db8b4ba9f121d8ac9462702c1cf.zip
frameworks_av-b352cec448530db8b4ba9f121d8ac9462702c1cf.tar.gz
frameworks_av-b352cec448530db8b4ba9f121d8ac9462702c1cf.tar.bz2
am cf2148e8: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit 'cf2148e863e2fed037aa0793d2822d9898289f17': Avoid a deadlock during EmptyBufferDone
0 files changed, 0 insertions, 0 deletions