tree 96535786107f490d1bf3e9228d568253bcccc7ae
parent ca3051f14ada2b976c2c2ebc1860a7cd244a9256
parent 2b6d670b272c74fcb0dfe7cee02b980715f760ab
author Andy McFadden <fadden@android.com> 1320873541 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1320873541 +0000

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

* commit '2b6d670b272c74fcb0dfe7cee02b980715f760ab':
  Disallow empty eventTimezone values. Do not merge