tree c6acf609ce160af36d6073e393898093bae531a6
parent 384759b1c5e39d0f99fa551a369ae73197ab26c5
parent d0ad67ad84e254cdf34963ad4152ca7158df5eab
author Daisuke Miyakawa <dmiyakawa@google.com> 1282699882 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282699882 -0700

am d0ad67ad: Merge "Fix the test breakage in vCard tests." into gingerbread

Merge commit 'd0ad67ad84e254cdf34963ad4152ca7158df5eab' into gingerbread-plus-aosp

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