tree 6475b8efd329739f4dc876c51c6b19afa3519033
parent 70b7e1042572eb4315f257839642d59fd4c21a1b
parent 19ccd4836992cf1efa7c251ec3bcbe5bd3a32829
author Mathieu Chartier <mathieuc@google.com> 1549070931 -0800
committer android-build-merger <android-build-merger@google.com> 1549070931 -0800

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

Change-Id: Ic42ad5b73227169825c2df701fbf2ca8afd9bd1a