Merge "Fix crash when deleting multiple files." into nyc-dev
tree: 419c13bf423206d3f9f00798f427e7471e632792
  1. jni/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags