tree a2bfcbbace0bfa99e1b6935ec5bc4f96729a37e0
parent e699ee4ed89f2d33c7566a57b3ebebb3df12e5aa
parent 6a962312358451fbb3c77ff7f6048388178f5677
author Daisuke Miyakawa <dmiyakawa@google.com> 1283458128 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1283458128 -0700

am 6a962312: am 0ddb8aab: Modify variables used in vCard code.

Merge commit '6a962312358451fbb3c77ff7f6048388178f5677'

* commit '6a962312358451fbb3c77ff7f6048388178f5677':
  Modify variables used in vCard code.