Merge "Never disable ViewInfoActivity" into nyc-dev
tree: 97ed6cc7ddb62b3800b78def34de9f0e4b4b28a8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml