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