tree 9b375167b67a38de51e93ba8b18228d3e664771a
parent e19bed56856896bc64c1265449ed347fc50d795b
parent fb13a3b9f4ed3a957f292a6562a97fab5542196d
author Tao Bao <tbao@google.com> 1497297704 +0000
committer android-build-merger <android-build-merger@google.com> 1497297704 +0000

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

Change-Id: I94450d2ddf1f8860fb9cd9f166c695f6d71f21a3