OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4f0dfe9 6b11545)
am 3a5e36f9: (-s ours) am 98c531dc: am 9b0c6bee: Merge "Fix a compiling error when...
authorJean-Baptiste Queru <jbq@google.com>
Wed, 3 Aug 2011 00:22:43 +0000 (17:22 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 3 Aug 2011 00:22:43 +0000 (17:22 -0700)
* commit '3a5e36f96bf61a8fb71c49cf93bd97c5e1d6abb4':
  Fix a compiling error when trying to use setBufferCount


Trivial merge
frameworks/native
About OSDN
Find Software
Develop Software
Help