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

[automerger skipped] Merge "Retire device/generic/mini-emulator-armv7-a-neon" am: 5890bf9a2f am: badf9c65ab -s ours

am skip reason: Change-Id I665c5d0018f7364093a3f2ed2f2c9bbc4c933998 with SHA-1 d6bb19d6c2 is in history

Change-Id: I59bda884bb7f7851a8f784308043e344a9ead98c