Merge "Go back to correct starting activity" into nyc-dev
tree: 8e6a019e9030e8b1495aafb13535cbbca0341229
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml