tree fd4405e6080b5fea3fc4462ff8049dcaff0f0007
parent e00e1ecd4ab11fe364e7cb7e7dcf4fd6d3dd16f5
parent 0aaae581445d43e8c4412df6ba72015fb4f325cb
author Hung-ying Tyan <tyanh@google.com> 1496996284 +0000
committer android-build-merger <android-build-merger@google.com> 1496996284 +0000

Merge "Merge "Move /default.prop to /system/etc/prop.default" into oc-dev am: fc00134c1e  -s ours am: fb4c882f29" into oc-dr1-dev-plus-aosp
am: 0aaae58144

Change-Id: Ic9bf841059e083a65ae26ca3c29f828fe9c94991