tree 91d404617acb138681c16a1c4a87d2741a801719
parent 2f3583423a28cd9e0510d4da853ae7b5ffca8924
parent b241a4c8e066f8143ae3806b472978ed92c5700b
author Treehugger Robot <treehugger-gerrit@google.com> 1589841152 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1589841152 +0000

[automerger skipped] Merge "Retire device/generic/mini-emulator-x86" am: 88ffb97113 am: 540a2a226b -s ours am: 6e3122e58d -s ours am: 41a946db3f -s ours am: b241a4c8e0 -s ours

am skip reason: Change-Id I54f7b876633a29224943405482c8221216d08438 with SHA-1 f4db79332c is in history

Change-Id: If2af730b44d8d261f9dc0d583660d480ca5adb80