am 330c1a06: Modify variables used in vCard code.

Merge commit '330c1a065f7e00df59c96225c6c4ed7d8e97d95d' into gingerbread-plus-aosp

* commit '330c1a065f7e00df59c96225c6c4ed7d8e97d95d':
  Modify variables used in vCard code.