OSDN Git Service

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)
commit2091772e7ce8ce5b7ff1ddb9921e60cbaa6bd5f0
treeaa88b7dd489184f5533f8942d588aeda663c1ede
parent6f56b21aed522b78b9c51256baa2ecea34c58f73
parent150bd0b2d7697424b9392572939cd44d75033ce6
am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread

Merge commit '8eb16af29303cda190133a1d220b9ecd9341e261' into gingerbread-plus-aosp

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