summaryrefslogtreecommitdiffstats
path: root/rootdir
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-10-22 14:35:12 -0700
committerElliott Hughes <enh@google.com>2012-10-22 14:35:12 -0700
commit066d3f9b3bd77df71542b132adda8eb25bc013c0 (patch)
tree2e8ce7e1095bed12313e765c380bdace619d3530 /rootdir
parenta40f5e662db68b297ff20c9ed418c726e0c001a1 (diff)
parent3e5e9e9ee2ee24072b7b87a3e4eda2df0639a469 (diff)
downloadsystem_core-066d3f9b3bd77df71542b132adda8eb25bc013c0.zip
system_core-066d3f9b3bd77df71542b132adda8eb25bc013c0.tar.gz
system_core-066d3f9b3bd77df71542b132adda8eb25bc013c0.tar.bz2
resolved conflicts for merge of 3e5e9e9e to jb-mr1-dev-plus-aosp
Change-Id: I621d0e984a266478b4297a25afd164c1275e30f9
Diffstat (limited to 'rootdir')
-rw-r--r--rootdir/init.rc1
1 files changed, 1 insertions, 0 deletions
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 @@ on post-fs-data
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