OSDN Git Service

resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp
authorLajos Molnar <lajos@google.com>
Fri, 19 Sep 2014 03:09:39 +0000 (20:09 -0700)
committerLajos Molnar <lajos@google.com>
Fri, 19 Sep 2014 03:09:39 +0000 (20:09 -0700)
commit435d9cde2777950c1d93b0982839d6796c5688b2
treecadfa7bfc3f2600949f8dbeeca01221528b0f801
parent556888b8ba32d923351bfb2317232dd78fff9c26
parent67d8bd66aaf04805cb8f2616ba964141b865e3b9
resolved conflicts for merge of 67d8bd66 to lmp-dev-plus-aosp

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