tree c502209807a3588c2ab8182c84ca4f929aa85e07
parent 907f001797cdf8a6fb894aa23c5ae879f1cb392c
parent 38ae3fa1e75873603891b4221b9b4803258fc52a
author Yo Chiang <yochiang@google.com> 1611553029 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1611553029 +0000

Merge "Add gsi_arm.mk product makefile" am: be7143fcb1 am: 38ae3fa1e7

Original change: https://android-review.googlesource.com/c/device/generic/common/+/1557688

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I465302f4907e3c2ecff1f2fde932e3147422b887