tree df96f3be3ce8a23cf7d72d6bd6ef409cf0339412
parent 90b3135d8b2471990412d79dce4ee6390118d8d3
parent 8eb16af29303cda190133a1d220b9ecd9341e261
author Mathias Agopian <mathias@google.com> 1282763839 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282763839 -0700

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