OSDN Git Service

am d3f9e815: resolved conflicts for merge of 5d0ad38c to jb-mr2-dev
authorElliott Hughes <enh@google.com>
Fri, 13 Sep 2013 18:46:09 +0000 (11:46 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 13 Sep 2013 18:46:09 +0000 (11:46 -0700)
commit6ebc24fcc3cf07f1be936ef9d7a8c3afff1861c7
tree8824d37ce677a65a6891bd1248491d345d9811a4
parent86125acacd0f06f8523917e6d94e8cd3d7a4aca2
parentd3f9e8155bfc17b2d67d2ffe5bc1d3a5e2656cd4
am d3f9e815: resolved conflicts for merge of 5d0ad38c to jb-mr2-dev

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