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

am: 642ca632f6  -s ours

Change-Id: I4dbc6a7e70277ddd910d28323d3c64aa28f8d4b0
This commit is contained in:
Tao Bao 2017-06-12 19:57:05 +00:00 committed by android-build-merger
commit e57cc426e3

Diff Content Not Available