OSDN Git Service

am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev
authorElliott Hughes <enh@google.com>
Fri, 13 Sep 2013 17:51:31 +0000 (10:51 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Sep 2013 17:51:31 +0000 (10:51 -0700)
commitb30f6eb026db05c969afacc758e529e73f0e314d
treec63300f993ca13a4bd39c8224c76fb10ff27e240
parentb8e1033c5b5813cb97d19645075591a357e9f04a
parent9e6104d54f541d43d3c1b785f2dfc1d2e09c0f2f
am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev

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