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

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

am 9e6104d5: resolved conflicts for merge of 05292dd6 to jb-mr1-dev
* commit '9e6104d5': Upgrade pre-jb-mr2 releases to tzdata2013d.
b30f6eb0 · Elliott Hughes · Android Git Automerger · b8e1033c · 9e6104d5 · b30f6eb0
Commit b30f6eb0 authored 11 years ago by Elliott Hughes Committed by Android Git Automerger 11 years ago
Showing with 1 addition and 1 deletion

libc/zoneinfo/zoneinfo.dat libc/zoneinfo/zoneinfo.dat +0 -0

libc/zoneinfo/zoneinfo.idx libc/zoneinfo/zoneinfo.idx +0 -0

libc/zoneinfo/zoneinfo.version libc/zoneinfo/zoneinfo.version +1 -1

No files found.
--- a/libc/zoneinfo/zoneinfo.dat
+++ b/libc/zoneinfo/zoneinfo.dat
--- a/libc/zoneinfo/zoneinfo.idx
+++ b/libc/zoneinfo/zoneinfo.idx
--- a/libc/zoneinfo/zoneinfo.version
+++ b/libc/zoneinfo/zoneinfo.version
-2012h
+2013d