tree c6d9bbc64035a29127ff8e705b0b1f73ef04d149
parent 1fec8d000038540c5d73341c7c372c64be650f0d
parent 5c3b22976121d9af67f7e98ad4d4a7e40a3b3434
author Pete Gillin <peteg@google.com> 1573126402 -0800
committer android-build-merger <android-build-merger@google.com> 1573126402 -0800

[automerger skipped] Merge "Switch to an OpenJDK 11 toolchain by default." am: 72813feb12 am: dffb9f647c
am: 5c3b229761 -s ours
am skip reason: change_id Iaae89ef25c92ec099575c026fc50e41da4e143e8 with SHA1 4fd368316e is in history

Change-Id: I4e1683e8f313314a8592451c2658003ab34ed699