Merge "Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev am: 642ca632f6
-s ours" into oc-dev-plus-aosp
This commit is contained in:
commit
7706a2fdd9