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