resolved conflicts for merge of 2f5c6d2d to honeycomb-plus-aosp

Change-Id: I858210fce4a04531afd9337a098db1dbf2308c2c
2011-06-30 17:28:59 -07:00
parent e0a4b67811 2f5c6d2d66
commit 946f3ad199
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 @@
-2011g
+2011h
@@ -1 +1 @@
 g
 h