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