am 949b3eb9: Merge change 7136 into donut

Merge commit '949b3eb9d3ced2a068fcec5a96a2d8b0e90d2fa2'

* commit '949b3eb9d3ced2a068fcec5a96a2d8b0e90d2fa2':
  Fix the lock issue on Home. This was caused by onPrepareDialog().
tree: bb592cc052d60d82ca6d378b1f9c4f3184e4a737
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE