tree 91d404617acb138681c16a1c4a87d2741a801719
parent 06f23624186063559dfb3511f179959f29bfa0b6
parent 5b66c936f730dc0c7393dc35d8177ee9094a462c
author Treehugger Robot <treehugger-gerrit@google.com> 1589841151 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1589841151 +0000

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

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

Change-Id: Icc1daf5cfc5149a95158c5cbcbf4d42f6d8a4b42