am 7bb1749c: work around and fix bugs

Merge commit '7bb1749c69384faf00b238f0684d3b2e23406451'

* commit '7bb1749c69384faf00b238f0684d3b2e23406451':
  work around and fix bugs
tree: 6f13fee551f4d7cf257d0561eeb3bddd0b6c381d
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE