am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW...
am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread
Merge commit '8eb16af2' into gingerbread-plus-aosp
* commit '8eb16af2':
don't try to lock a buffer that wasn't allocated with SW usage bits