Merge change 2865 into donut

* changes:
  Fixes #1890155.
tree: c6247e557f9e549a558859c2170645e2b1d9dc15
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE