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

Change-Id: I621d0e984a266478b4297a25afd164c1275e30f9
This commit is contained in:
Elliott Hughes 2012-10-22 14:35:12 -07:00
commit 066d3f9b3b

View file

@ -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