reconcile korg/master into goog/master
tree: 4ae46195ad8b20887f68846d192df455df301ff3
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE