OSDN Git Service

resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aosp
authorDan Stoza <stoza@google.com>
Sat, 17 Jan 2015 00:18:51 +0000 (16:18 -0800)
committerDan Stoza <stoza@google.com>
Sat, 17 Jan 2015 00:18:51 +0000 (16:18 -0800)
commit3372cc25df255b94e4eb75920afaf43ee5edc39f
tree4a274cb51bb8c9e08d885628c5dc40b4e89f96f3
parent499127eab812088ca24421b59ebfac6f47ea850f
parent03eccb6616744c3789b6018680de7bf5a18f71ce
resolved conflicts for merge of 03eccb66 to lmp-mr1-dev-plus-aosp

Change-Id: I1f38cbe7019b2b48b1094dee154ad97c23fd22c2
services/surfaceflinger/Android.mk
services/surfaceflinger/SurfaceFlinger.cpp