OSDN Git Service

resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp
authorLajos Molnar <lajos@google.com>
Fri, 19 Sep 2014 13:23:46 +0000 (06:23 -0700)
committerLajos Molnar <lajos@google.com>
Fri, 19 Sep 2014 13:23:46 +0000 (06:23 -0700)
commit147372fdf9fae688114121228247497d43514ab7
treecadfa7bfc3f2600949f8dbeeca01221528b0f801
parent8990766e446384d739236f776ef6043f62c75785
parent67d8bd66aaf04805cb8f2616ba964141b865e3b9
resolved conflicts for merge of 67d8bd66 to lmp-mr1-dev-plus-aosp

Change-Id: I5e7e6fdf0d2afe6c3e4a0ed6ef96afb4713a72bc
include/gui/ISurfaceComposer.h