OSDN Git Service

am 32ea9fe5: Merge "Put all the tzdata in one file."
authorElliott Hughes <enh@google.com>
Wed, 17 Oct 2012 23:09:31 +0000 (16:09 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 17 Oct 2012 23:09:31 +0000 (16:09 -0700)
* commit '32ea9fe5783e3cc9756205c0ac46482afc700a3d':
  Put all the tzdata in one file.


Trivial merge