tree 339a85582a950550a99976b5310b81c67ed804af
parent f00f7e42c389c809bf475681df998e77a5baa9e4
parent b5ebc48565ceb23feba21cc12fbbb2cc34802209
author Eric Fischer <enf@google.com> 1280275166 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280275166 -0700

am b5ebc485: am cc7fc9e8: Update time zone data to the new version 2010k.

Merge commit 'b5ebc48565ceb23feba21cc12fbbb2cc34802209'

* commit 'b5ebc48565ceb23feba21cc12fbbb2cc34802209':
  Update time zone data to the new version 2010k.