tree 8925704da3e23d9386671ca175769bd922e31e69
parent 305e18b64f6194f9f4eb7792cdf2afaaffa18fc1
parent fa25d0a7b02f12f1ff10e3741369fac2883af688
author Ken Shirriff <kens@google.com> 1249417261 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1249417261 -0700

am 8a98f580: (-s ours) Fix broken calendar tests. DO NOT MERGE

Merge commit '8a98f5803994ca1538d53973ebc72e1c5dfdba5a'

* commit '8a98f5803994ca1538d53973ebc72e1c5dfdba5a':
  Fix broken calendar tests. DO NOT MERGE