tree 285953a5169cd7ea1e7384f7c0362e29941800a7
parent 87b3b3f27b07377196dd18a4595125a16b9b3b85
parent c089a8c62cfa1718dc0afabb931cc24bbed3f38e
author Cole Faust <colefaust@google.com> 1633372802 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1633372802 +0000

Merge "Make mk2rbc accept either a makefile or product" am: 00364b6114 am: c089a8c62c

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

Change-Id: I34c9d316896ac290dbeaf1ce24ae5bc731b7230e