Merge "Revert "Move /default.prop to /system/etc/prop.default"" into oc-dev

am: d4b25e481e  -s ours

Change-Id: I11773c0b8ed6727b0b225635f590337ec04dd06f
This commit is contained in:
Tao Bao 2017-06-12 19:57:16 +00:00 committed by android-build-merger
commit fb13a3b9f4

Diff content is not available