tree 96abc1c876d0975c1b647728cc80791341d2eead
parent 6709621b5ffdfd508045fe16f2e66a5c4c0ae96e
parent 46adfbc949c43e59b97ad45746ab42633a734aed
author Mathias Agopian <mathias@google.com> 1282951092 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282951092 -0700

am d322d163: am ae66946b: Merge "fix a race in SF buffer management" into gingerbread

Merge commit 'd322d16323176ddd5fef3383798176f64d0078c8'

* commit 'd322d16323176ddd5fef3383798176f64d0078c8':
  fix a race in SF buffer management