commit 066d3f9b3bd77df71542b132adda8eb25bc013c0
author Elliott Hughes <enh@google.com> Mon Oct 22 14:35:12 2012 -0700
committer Elliott Hughes <enh@google.com> Mon Oct 22 14:35:12 2012 -0700
tree 2e8ce7e1095bed12313e765c380bdace619d3530
parent a40f5e662db68b297ff20c9ed418c726e0c001a1
parent 3e5e9e9ee2ee24072b7b87a3e4eda2df0639a469

resolved conflicts for merge of 3e5e9e9e to jb-mr1-dev-plus-aosp

Change-Id: I621d0e984a266478b4297a25afd164c1275e30f9

rootdir/init.rc

diff --git a/rootdir/init.rc b/rootdir/init.rc
index caef358..af42223 100644
--- a/rootdir/init.rc
+++ b/rootdir/init.rc
@@ -200,6 +200,7 @@
     mkdir /data/misc/keystore 0700 keystore keystore
     mkdir /data/misc/keychain 0771 system system
     mkdir /data/misc/sms 0770 system radio
+    mkdir /data/misc/zoneinfo 0775 system system
     mkdir /data/misc/vpn 0770 system vpn
     mkdir /data/misc/systemkeys 0700 system system
     # give system access to wpa_supplicant.conf for backup and restore