Merge "Fix bug 3138074. Edit Tags app strings to match mocks." into gingerbread
tree: a54a31d583a9574e4c51cfdfc33c392045730202
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml