am 9e1ad1da: am 858017f1: First part of the fix for bug 2204255

Merge commit '9e1ad1da6ba63b7bd01043466a7bcbfa4a8e704f'

* commit '9e1ad1da6ba63b7bd01043466a7bcbfa4a8e704f':
  First part of the fix for bug 2204255
tree: 0d9407a15ecac49a6c824bf547f304a0970d82f5
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE