From: Dan Stoza Date: Sun, 22 Mar 2015 00:40:38 +0000 (+0000) Subject: am da3b1e7f: (-s ours) am 23707911: (-s ours) am 701473cf: (-s ours) Merge "DO NOT... X-Git-Tag: android-x86-6.0-r1~254 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d3260abf78765fb304a322ff9a7ebb6b2838b362;p=android-x86%2Fframeworks-native.git am da3b1e7f: (-s ours) am 23707911: (-s ours) am 701473cf: (-s ours) Merge "DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem" * commit 'da3b1e7ff20559ba368a22421c15ffe2cc079386': DO NOT MERGE SurfaceFlinger: Stop using IGBC::BufferItem --- d3260abf78765fb304a322ff9a7ebb6b2838b362