manually merge is done

Change-Id: I39772634af6e7928a8d27c00737cb790e60e8643
add the original build.prop

Change-Id: I2d351e2d49ea935f6ea06e700fd991faa5467d7f
apply the patch for build.prop
efault.prop and insecure
add key for customized apps

Change-Id: I486d162125b368fc7197f5dabdc8bf0569e050b1
patch patch_1.p from i9300
4e7e4bb743c94a1b09b80dba51697aaa95c8654b^
3deec2a145a0c7446fc290bb3201ebdeb10c3699

Change-Id: Ice66f0cb0829f89152dfd2fc651faf20f3806957
add all stuff from i9300 for modified apps

Change-Id: Ia908ae0dd83fa3f9d5cd01ec6ee3e0d707e39376
add spn-conf.xml

Change-Id: I9df046d323a0ef49dfdab768ea458302d6117053
fix error in framework and service

Change-Id: Ic20a73488b0212b96b228ee523208b3a4d0537f4
fix rington and recovery

Change-Id: I646723f2806a63d6199de6763bcb47cbb39a7eb7
fix lockscreen issue

Change-Id: I0af234d9636c778e5b81afb768499e2d911d966b
add OriginalSettings

Change-Id: I24749b917b76a689dacee38c1d52a6a81645eae9
support mw

Change-Id: I1b49b5d54995bf430529d4a63f3ff3475db0e402
add Snote stuff

Change-Id: If9a22f4c88e3ff75ed49a7ffe0b0e9c83d4b521f
add spen settings

Change-Id: I5825222f3b465f3227177b0284912c56e5dbd1c9
fix issue can not unlock device

Change-Id: I121b157acb3f26637492dee639e8bfbd868a1302
disable magnifier

Change-Id: Iefc0249dd2a64ed8077377a92c582a2cf64c3311
merge change for locale picker

Change-Id: Ic725c97dec18c8bd93c5d5e3eeafb48883ed02d7
merge callIsIdeographic

Change-Id: I871fba1fd72b0aaee1cbb26eb28e569e60bfac48
remove orginal settings extended page

Change-Id: Ia2fbd942a33cbc0b37ce2c55d097746b340b20c2
adjust icon size of lancher

Change-Id: Ic59e5bfe662b56ead8cf24181403b65298c7ca99
fix access control

Change-Id: I7e3602cf791c169d98b9fa1e24389185752bf3cd