am 510c489a: am d4e57d4c: Related work on issue #2170897.

Merge commit '510c489a081dae49f86033ecbf1b6e866c69656c'

* commit '510c489a081dae49f86033ecbf1b6e866c69656c':
  Related work on issue #2170897.
tree: 56204f636f50e17ea9ea6b1b5751edf28cf1ea97
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE