tree ba7baa1cbc2a4ab93b7523a90df9c8b132aab577
parent 829c16e388de935aaa8efc922058d604ee7471e8
parent 7cff0854f44da547e08a59715b547f6e17ee5d47
author Andreas Huber <andih@google.com> 1276297170 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276297170 -0700

am 126ca6f9: Merge "Must hold lock here..." into gingerbread

Merge commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b' into gingerbread-plus-aosp

* commit '126ca6f9ecab6f912ea9f4f00af35c410aae504b':
  Must hold lock here...