tree d617d7912fbcca308963d3bf99fe3bd93abba7d5
parent 65e4eaa21661c8847a3671f666f3f59461d57a78
parent b2f12e42caa4aef658e9dd8eb23194f34f96a0b7
author Elliott Hughes <enh@google.com> 1495736139 +0000
committer android-build-merger <android-build-merger@google.com> 1495736139 +0000

Merge "Revert "Load {default,build}.prop from /{system,vendor,odm}/etc/"" am: f9259b59e8
am: b2f12e42ca

Change-Id: I18ffd6f2f2843afa6534ba82caaf21e70f80e61e