tree aae525157271379a4e8827c8150507aba384e2f3
parent 31d5f5bb57aa0f2ba7cc82462e764aac42a51fe7
parent 7c30a61bc6ec64594c30a690e3d18d0f263d2e3c
author Treehugger Robot <treehugger-gerrit@google.com> 1649708781 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1649708781 +0000

Merge "Non-module targets." am: ff15a27bd7 am: 7c30a61bc6

Original change: https://android-review.googlesource.com/c/platform/build/+/2055031

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