OSDN Git Service

resolved conflicts for merge of 4037c458 to master
authorDan Albert <danalbert@google.com>
Fri, 14 Nov 2014 19:09:30 +0000 (11:09 -0800)
committerDan Albert <danalbert@google.com>
Fri, 14 Nov 2014 19:13:20 +0000 (11:13 -0800)
commit41a0ef3e28c4d2494f6cdd1c831dd3ded7c5af4a
tree1f4a796523bf66e369c79190cd6cf9a302a8a2c3
parentd26b17a1370851b3a6b989cc802a5989bcdb0f45
parent4037c458a7594cb3cd81a14e7e974abc28180187
resolved conflicts for merge of 4037c458 to master

Change-Id: I8a2e73b7ba48b790054e0ab99f81b2693244389e
services/surfaceflinger/Android.mk
services/surfaceflinger/DisplayDevice.cpp