OSDN Git Service

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

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