OSDN Git Service

resolved conflicts for merge of 1f9f71e1 to lmp-mr1-dev-plus-aosp
authorLajos Molnar <lajos@google.com>
Thu, 29 Jan 2015 05:27:46 +0000 (21:27 -0800)
committerLajos Molnar <lajos@google.com>
Thu, 29 Jan 2015 05:27:46 +0000 (21:27 -0800)
commit180c2ba763c32793c6d3c5fe2683f8f2b233ca10
treefb8fbfc42cb74bbf6ad19952748098e34ed49fb3
parent2f1e3b4d219d1ad3fe66cc9abb4ed61be9906ed1
parent1f9f71e183946b390fff4d20900bc4a03246a882
resolved conflicts for merge of 1f9f71e1 to lmp-mr1-dev-plus-aosp

Change-Id: I627e58fe738e9a3b9831508853f26f9adc350f90
libs/ui/GraphicBufferMapper.cpp