OSDN Git Service

(root) / android-x86 / frameworks-native.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6f56b21 150bd0b)
am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage...
authorMathias Agopian <mathias@google.com>
Wed, 25 Aug 2010 19:17:19 +0000 (12:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 25 Aug 2010 19:17:19 +0000 (12:17 -0700)
Merge commit '8eb16af29303cda190133a1d220b9ecd9341e261' into gingerbread-plus-aosp

* commit '8eb16af29303cda190133a1d220b9ecd9341e261':
  don't try to lock a buffer that wasn't allocated with SW usage bits


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