tree a0e4d38500b570379da0c465574e0aa2224a3b53
parent c688c0f98fb9ccda3e93a470d7fbcab03cfde7d2
parent 16eae49bd94738616fbda0c1d23eeb3e49fd7856
author Mathieu Chartier <mathieuc@google.com> 1540850541 -0700
committer android-build-merger <android-build-merger@google.com> 1540850541 -0700

Merge "Add dalvik.vm.dex2oat-resolve-startup-strings feature flag" am: 692bc1f89c
am: 16eae49bd9

Change-Id: Ifc00abfa474a7903464ad98be3698cf4d8e8d56e