tree 70e376f699f4a354dd7135601d6b489af99665e0
parent da16ad11fe83d41d43bcf30b3aad01aafa8f5bc6
parent 6d074bb71a316f73f35f4430a71fa706c46d4b75
author Elliott Hughes <enh@google.com> 1330715585 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330715585 -0800

am 6d074bb7: am 70d1d45f: am a58c88c2: Merge "Upgrade to tzdata2012b."

* commit '6d074bb71a316f73f35f4430a71fa706c46d4b75':
  Upgrade to tzdata2012b.