am 6a2641d8: Merge "Initial support for adding VCard data to the tag editor." into gingerbread

Merge commit '6a2641d8ac4aff1b4c67854e4bf19e4c8dfeb94e'

* commit '6a2641d8ac4aff1b4c67854e4bf19e4c8dfeb94e':
  Initial support for adding VCard data to the tag editor.
tree: b4adb91e13b9a425dac68aece931bee016039254
  1. canon/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml