am 18b36f0d: am b6f23a6c: am bbe41b55: Merge change I4bd71b0f into eclair

Merge commit '18b36f0dbaaf7164a9a77dc5a5431d324e36c879'

* commit '18b36f0dbaaf7164a9a77dc5a5431d324e36c879':
  Fix http://b/issue?id=2203681
tree: ad542faabd63a7068ebddf095b462c18905b35c1
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE