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

am: eb274d47e7  -s ours

Change-Id: I7b0ad3aad9d8d8e3edceba6621336b72c60c5bc6
This commit is contained in:
Hung-ying Tyan 2017-06-28 06:35:43 +00:00 committed by android-build-merger
commit cf5f11d769

Diff content is not available