tree a1e52df4cb2b69ac028bb1da45c65a37a96365fb
parent 2e48f7e4e39a879f0137e81f0eae3e8526403f36
parent e5b4978094c731f7d9b83bb628827fb3a2ba7f8f
author Mathias Agopian <mathias@google.com> 1282937015 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282937015 -0700

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

Merge commit 'ae66946bd9e9f1168241c75196d2379b43e3ca30' into gingerbread-plus-aosp

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