tree 3d7a6ea3e640e88684325b18b52731badb53d295
parent 938f7fdcb8845cbbd79d499c1aa30c1c57630039
parent b4b73968bc271271d1529ca77344f0f2d63955b1
author Daisuke Miyakawa <dmiyakawa@google.com> 1282701540 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282701540 -0700

am 1922ac10: (-s ours) am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread

Merge commit '1922ac108ce6fd12f640b2892aa1eb348911a94b'

* commit '1922ac108ce6fd12f640b2892aa1eb348911a94b':
  Fix the test breakage in vCard tests.