Merge "Load default prop from /system/etc/prop.default" into oc-dev am: 0af496af01 -s ours am: fbdbbeff82

am: 63b84d2c29

Change-Id: I19aaac641db46c703ddaebcf9d6c18828a90ed5c
This commit is contained in:
Hung-ying Tyan 2017-06-09 08:17:17 +00:00 committed by android-build-merger
commit 1afcf1b543

Diff Content Not Available