tree 9535013ef46bc8c2bb119e23ead0c28f5b894a94
parent d334b0d12ff15ddc4da0df723db903f44663389c
parent 1543ffc4285f52e04daccca876c6581b7a1eeb45
author Daisuke Miyakawa <dmiyakawa@google.com> 1282691867 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1282691867 -0700

am 28060c8a: (-s ours) am 6dd19ca5: Merge "Make VCardTestsBase public." into gingerbread

Merge commit '28060c8a806b58fc53f281688146877e8c37a504'

* commit '28060c8a806b58fc53f281688146877e8c37a504':
  Make VCardTestsBase public.