tree fa3c691ca06ab13f77551b6dcf69c208ba99d66d
parent 95a46909c72f19b35c5da969e4d54917599f4c4c
parent 9aa57e09ef7234b6d82ffa4a4889508e64e424b9
author Elliott Hughes <enh@google.com> 1366949988 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366949988 -0700

am 9aa57e09: am 9ff1ffd8: Merge "Improve diagnostics in the face of bad tzdata."

* commit '9aa57e09ef7234b6d82ffa4a4889508e64e424b9':
  Improve diagnostics in the face of bad tzdata.