tree b2c8adedc4f732dbe0c105ba85f9b345262ba39b
parent 90cf56656bb0611982899da2fac4e78a3779caad
parent ee8f3f03639e095ae922751995b688ca99ba3cfb
author Sorin Basca <sorinbasca@google.com> 1642172695 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1642172695 +0000

Merge "Setting dx test to use Java 9" am: 056a3e43d1 am: ee8f3f0363

Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1948558

Change-Id: I315b9c92a9e3c8aa6656dfd7e6c6bce0babc27bb