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