tree bbf2eb7aaf3e0cf81d73bbb75bd58362e7c0025a
parent df93796a1b8455ae1653f22270e13b0a6494d822
parent f95100ea776f4e7532c856c1e51588aa24b2ac9a
author Mathieu Chartier <mathieuc@google.com> 1549071213 -0800
committer android-build-merger <android-build-merger@google.com> 1549071213 -0800

Merge "Add handling for PH property dex2oat_resolve_startup_strings" am: 25d4688e91 am: 19ccd48369
am: f95100ea77

Change-Id: Iff4d3cefd6dad6ffffd18859b8f5645f40879258