merge in nyc-mr1-release history after reset to nyc-mr1-dev
tree: 74d1a325da9b8cf89a3d6b5ac757644ad24f610a
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags