OSDN Git Service

am e0d1d4cf: am 6ebc24fc: am d3f9e815: resolved conflicts for merge of 5d0ad38c to...
authorElliott Hughes <enh@google.com>
Sat, 14 Sep 2013 00:13:46 +0000 (17:13 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 14 Sep 2013 00:13:46 +0000 (17:13 -0700)
* commit 'e0d1d4cf497bddd8f24b6d22feec33d655cae0dd':
  Upgrade pre-jb-mr2 releases to tzdata2013d.


Trivial merge