tree 48db6fa56da169ce1291f85f42c97595a0405ebc
parent d2d14aa0ea8a32caa5634c9854249cea62c90e21
parent d4b25e481eac01038154f5b4a11c9fbb867b5819
author Tao Bao <tbao@google.com> 1497297434 +0000
committer android-build-merger <android-build-merger@google.com> 1497297434 +0000

Merge "Revert "Move /default.prop to /system/etc/prop.default"" into oc-dev
am: d4b25e481e  -s ours

Change-Id: I1e5e8ec5b347cc5cb3940a99873ef476e521cd30