OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 571e27e c4bd721)
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)
* commit 'c4bd7211373cf5b745c7d4f849f43f7a2d2b1141':
  resolved conflicts for 7534e4e6 to lmp-mr1-ub-dev

1  2 
libs/gui/IGraphicBufferProducer.cpp patch | diff1 | diff2 | blob | history

diff --cc libs/gui/IGraphicBufferProducer.cpp
Simple merge
frameworks/native
About OSDN
Find Software
Develop Software
Help