merge from open-source master
tree: 0e77296cce4e82da10c141c2947a10c2016d31fb
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE