resolved conflicts for merge of cfe535ef to stage-aosp-master

Change-Id: I21a1dd41503518e75892180c14f1ce79102772ad
2012-03-02 10:11:18 -08:00 · 2012-03-02 10:11:18 -08:00 · a480cf930f
commit a480cf930f
parent 018c27eda8 cfe535ef9f
3 changed files with 1 additions and 1 deletions
--- 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
@ -1 +1 @@
-2011n
+2012a
 @ -1 +1 @@
 n
 a