OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 11b9588 5273a97)
am 5273a978: resolved conflicts for merge of 86aeb9ef to lmp-dev-plus-aosp
authorDan Albert <danalbert@google.com>
Tue, 9 Sep 2014 05:25:03 +0000 (05:25 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Sep 2014 05:25:03 +0000 (05:25 +0000)
* commit '5273a978337cbee2c1aae2f4d5c1b0e9d8dd6e1c':
  Make string literal concatenation play nice with C++11.

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

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