tree 1dea8fca7b50f3104b911963f7b39663dbf23970
parent fb52e9136e5b5bc2f2bece696426ee1d68d63038
parent 1f64c188804bc4c15e4a97ed1792dc22ea1b111b
author Andy McFadden <fadden@android.com> 1320887501 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320887501 +0000

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

* commit '1f64c188804bc4c15e4a97ed1792dc22ea1b111b':