am bb593755: Merge change 2865 into donut

Merge commit 'bb593755d2fa8980855072dfdc72aae3adb2e6dd'

* commit 'bb593755d2fa8980855072dfdc72aae3adb2e6dd':
  Fixes #1890155.
tree: 2f116cdc609c6ad3e07100aab6407434e2e5ba78
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE