tree 9944eb20cb3bcd3199adcf6df2679a31ebdbe271
parent ff2ce02c7afe404472932d1914460edff1f9f7cc
parent 07a7d5ce4ee1e29e01cc46911c97e849db64a317
author Andy McFadden <fadden@android.com> 1320857097 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320857097 +0000

am 07a7d5ce: am ba79889d: (-s ours) Disallow empty eventTimezone values. Do not merge

* commit '07a7d5ce4ee1e29e01cc46911c97e849db64a317':