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

am: d4b25e481e  -s ours

Change-Id: I1e5e8ec5b347cc5cb3940a99873ef476e521cd30
This commit is contained in:
Tao Bao 2017-06-12 19:57:14 +00:00 committed by android-build-merger
commit 46e6c931e4

Diff Content Not Available