am a26868d6: am 8907fc2a: am 4a5c1e1e: Fix 2209039 and 2220106

Merge commit 'a26868d6afffff8be91653da36cb4152ed68759a'

* commit 'a26868d6afffff8be91653da36cb4152ed68759a':
  Fix 2209039 and 2220106
tree: 1aa5d96d4f2da0806dd673b50fe6ec65ec0036d6
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE