tree e8dc838cae90400c395a62e7c1ade30a373762b9
parent a4e70243335ebc236cf94ee56a438ef711301b3b
parent 8cd8c8dd98938600700e0aa86cbcec2fd6f9324e
author Tom Cherry <tomcherry@google.com> 1513311642 +0000
committer android-build-merger <android-build-merger@google.com> 1513311642 +0000

Merge "Do not reinitialize system properties to fake their values"
am: 8cd8c8dd98

Change-Id: Ia81418e6816385edcdbb9d6a79e8412947e42285