OSDN Git Service

resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
authorNaveen Leekha <leekha@google.com>
Thu, 24 Sep 2015 22:55:21 +0000 (15:55 -0700)
committerNaveen Leekha <leekha@google.com>
Thu, 24 Sep 2015 22:55:21 +0000 (15:55 -0700)
commitc4bd7211373cf5b745c7d4f849f43f7a2d2b1141
tree2a76f16e90d40795bfb26d9d239cd2431c619051
parente889592e33891c9b88ff6ba655426118f8ef12ee
resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

Change-Id: I543df164076b44578b14d41031800bb62b81586d
libs/gui/IGraphicBufferProducer.cpp