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:
Android Build Merger (Role) 2017-06-12 19:57:41 +00:00 committed by Android (Google) Code Review
commit 7706a2fdd9

Diff content is not available