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