tree 6469d3a42953db6a314b449c120665bdeac2eb1e
parent b85906517b77a2e53fd8ae200cecfeb243b76f25
parent 9fe3e4f5b20f20c928b47ac20a41c3bfe8558359
author Treehugger Robot <treehugger-gerrit@google.com> 1605050127 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1605050127 +0000

Merge "emulator: use 5.4 for sdk_phone_arm64" am: 9fe3e4f5b2

Original change: https://android-review.googlesource.com/c/platform/development/+/1494658

Change-Id: I508e270379b44d583d79f59ebab3750fe522fdaa