OSDN Git Service

resolved conflicts for merge of d6308379 to lmp-dev
authorMichael Lentine <mlentine@google.com>
Tue, 2 Dec 2014 19:15:56 +0000 (11:15 -0800)
committerMichael Lentine <mlentine@google.com>
Tue, 2 Dec 2014 19:15:56 +0000 (11:15 -0800)
commit784fd39a19f659e3b464bd9a78361c0adc1cdcab
tree694d137ce7c7148182a9c418776afaf89fefce6a
parentafe2b1fadd29149ceed639357e44e06e97c3a5ca
parentd6308379d9ddf946f5ce60fa2d0b809fa1238a63
resolved conflicts for merge of d6308379 to lmp-dev

Change-Id: I92ed61b6fdfe458cf5f8bfd6f0b37ff736280500
libs/ui/GraphicBuffer.cpp