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

Merge commit '28060c8a806b58fc53f281688146877e8c37a504'

* commit '28060c8a806b58fc53f281688146877e8c37a504':
  Make VCardTestsBase public.