tree faeee51d68f2310c742f2aa70c2358e2fbf2306f
parent 9d944c6fb8c117674d1f02ca567629ab62add6b8
parent ab66ed2e067cbd1bc415b6cf66f3b5191b166461
author Joe Onorato <joeo@android.com> 1276280114 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1276280114 -0700

am ab66ed2e: Merge "This variable can be checked outside the lock because it\'s only set from the ui thread." into froyo

Merge commit 'ab66ed2e067cbd1bc415b6cf66f3b5191b166461'

* commit 'ab66ed2e067cbd1bc415b6cf66f3b5191b166461':
  This variable can be checked outside the lock because it's only