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