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