resolved conflicts for merge of 88f05e8d to master
authorBenoit Goby <benoit@android.com>
Wed, 28 Nov 2012 02:36:12 +0000 (18:36 -0800)
committerBenoit Goby <benoit@android.com>
Wed, 28 Nov 2012 02:36:12 +0000 (18:36 -0800)
commitc8a9913afea1419253f6948450275a48fffb5aee
tree8c30265af3703a90c055ac1e647123613fb56fe6
parent70b4345916cacd7c7c5a27e384b16402b23c9beb
parent88f05e8db5f544366cf5418f40b294ef433c8e05
resolved conflicts for merge of 88f05e8d to master

Change-Id: Ib18aebd1c0f4f3ace3d7307109fcc6ae5c7a7d65
libhwc/hwc.cpp