am a480cf93: resolved conflicts for merge of cfe535ef to stage-aosp-master

* commit 'a480cf930f31ab404e7efe66259427a53d72fa2b': Upgrade to tzdata2011a.
2012-03-02 10:47:23 -08:00
parent cff86bdc02 a480cf930f
commit a2b1bbc9a6
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