tree 38deee14510a7baf31cc46761505b5aebf786c78
parent 9a74e36f4810ca22cb12f8eafe4f929edfa57e58
parent 6ebc24fcc3cf07f1be936ef9d7a8c3afff1861c7
author Elliott Hughes <enh@google.com> 1379098220 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379098220 -0700

am 6ebc24fc: am d3f9e815: resolved conflicts for merge of 5d0ad38c to jb-mr2-dev

* commit '6ebc24fcc3cf07f1be936ef9d7a8c3afff1861c7':
  Upgrade pre-jb-mr2 releases to tzdata2013d.