tree e8dc838cae90400c395a62e7c1ade30a373762b9
parent 78626ad9b542494a2b030290021a9890ced38c28
parent db701fd510c71c3d9f9241be1ee83d75b35cf40c
author Tom Cherry <tomcherry@google.com> 1513311792 +0000
committer android-build-merger <android-build-merger@google.com> 1513311792 +0000

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

Change-Id: Iff185226514c74f80ea1113dbd1afa78c8243da6