OSDN Git Service

am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
authorNaveen Leekha <leekha@google.com>
Thu, 24 Sep 2015 23:27:31 +0000 (23:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 24 Sep 2015 23:27:31 +0000 (23:27 +0000)
commit69412a51f58fa9450f1cb077c8d4b6410128d993
treef6f11ce1cfe6cd287a059393619b94829faf9849
parent571e27e20e30560985d7c3a3ba8885693695b0fc
parentc4bd7211373cf5b745c7d4f849f43f7a2d2b1141
am c4bd7211: resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

* commit 'c4bd7211373cf5b745c7d4f849f43f7a2d2b1141':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev
libs/gui/IGraphicBufferProducer.cpp