tree 39ca88e794c6ce87cf122754812143f3bd7e6237
parent 16376afb8d771a497d0474d59e93a5f23b3aec50
parent 468204124e95bbf74ae8cc000318ade29e311be6
author Mathias Agopian <mathias@google.com> 1282764242 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282764242 -0700

am 46820412: am 8eb16af2: Merge "don\'t try to lock a buffer that wasn\'t allocated with SW usage bits" into gingerbread

Merge commit '468204124e95bbf74ae8cc000318ade29e311be6'

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