merge in nyc-release history after reset to master
tree: 440cd07ec90d4aec4bc2dd7f28d3431e3d479c81
  1. jni/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml