Merge "Revert "Load default prop from /system/etc/prop.default"" into oc-dev

am: 642ca632f6  -s ours

Change-Id: Ice9637c768c0ef1bf60e603e31be3f5403c81aa3
This commit is contained in:
Tao Bao 2017-06-12 19:57:06 +00:00 committed by android-build-merger
commit 869f48a256

Diff Content Not Available