merge in nyc-release history after reset to nyc-dev
tree: f29ab9748b97187d6c39b73ac6e6ab01b5cf6117
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml