tree f9206fc26e3ac08a18e9665a00eca442413c309d
parent 1234f0b4bc97223a16b70d8f61bc0f04eb6695ed
parent af0dd9f082ff3ab5295cbf00eb2ea6d8db820ce6
author Wink Saville <wink@google.com> 1344463065 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344463065 -0700

am af0dd9f0: Merge "Stk: Fix crash due to race condition"

* commit 'af0dd9f082ff3ab5295cbf00eb2ea6d8db820ce6':
  Stk: Fix crash due to race condition