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