Merge change I4bd71b0f into eclair

* changes:
  Fix http://b/issue?id=2203681
tree: d999a03b4eb1d5511c30f9f560e0f6b56806cdd0
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE