Merge commit '4bd98d79334c4a4b3796a821bcddfaadb862ea99' into HEAD
tree: e4dd71479bf07ab121f5a2bc4a4e96208e0a0ed8
  1. jni/
  2. res/
  3. src/
  4. Android.mk
  5. AndroidManifest.xml