am 2eb49ff2: Fixes #1889268.

Merge commit '2eb49ff2a3f7066cae1768d2314c4f912bd6c28d'

* commit '2eb49ff2a3f7066cae1768d2314c4f912bd6c28d':
  Fixes #1889268.
tree: 24f40ed55650b0e5d20aba3a100a1fc66b658122
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE