tree e48c749550d2f50e9a6069bafb8974d0e59f5c80
parent 447c91469e11acf5bfd538cdfc72487e92bd192b
parent 5d7dad5a8e47f5d01c166f55e8d6c90e0e0e972c
author Treehugger Robot <treehugger-gerrit@google.com> 1589840325 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1589840325 +0000

[automerger skipped] Merge "Import goldfish soong namespaces to mini_common.mk" am: 6c45a6eab2 am: d511509153 -s ours am: ebd337c459 -s ours am: 5d7dad5a8e -s ours

am skip reason: Change-Id I58e0b35fd548b42717d333682fb1f5653424777c with SHA-1 31a435732a is in history

Change-Id: Ifc98c4949f26b13e69f92b47e5d4632f0340f89a