tree f60f485b7df75350a1a1b01357b19ce3272166dd
parent 9548337463445c6f75ba5ac0b9b2a3f7cedd2563
parent de0d061137d3e081682c48de918412d473c693f0
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 1700536496 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1700536496 +0000

Merge "Android.mk is going to be deprecated under device/google folder" into main am: 4a43047559 am: 8502c68f2b am: de0d061137

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

Change-Id: Id1787225ae7d38f99b8199a0af6f50ec07519085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>