tree c63300f993ca13a4bd39c8224c76fb10ff27e240
parent a4b20d712b9c6cbc562529d3a41bf8ea1515562a
parent b30f6eb026db05c969afacc758e529e73f0e314d
author Elliott Hughes <enh@google.com> 1379094823 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1379094823 -0700

am b30f6eb0: am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev

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