OSDN Git Service

resolved conflicts for merge of 790b6d09 to master
authorJamie Gennis <jgennis@google.com>
Wed, 9 Oct 2013 00:50:36 +0000 (17:50 -0700)
committerJamie Gennis <jgennis@google.com>
Wed, 9 Oct 2013 00:50:36 +0000 (17:50 -0700)
commitb85d2cf0a20e46261db8fee4839840f0ef715c68
tree845c02e305446e4c9913a25e1018621f6873cb95
parent192b7fa0289e7a6f45249bc029db1d24f6633b5c
parent790b6d092ce2702c9d561dfd2c873b5793e765d2
resolved conflicts for merge of 790b6d09 to master
services/surfaceflinger/DisplayHardware/HWComposer.cpp
services/surfaceflinger/SurfaceFlinger.cpp
services/surfaceflinger/SurfaceFlinger.h