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