am c2e24c0a: Fixes #1876911

Merge commit 'c2e24c0a37ddeab930f731c062705d435e477f75'

* commit 'c2e24c0a37ddeab930f731c062705d435e477f75':
  Fixes #1876911
tree: b88f7e98492ea25e24a79d8a980bbb97ab86171a
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE