tree 7bc71ba5236f9a0ed7f56d8cb01924aa2b4118c4
parent ab47ce778e40d74686363d5ad042f9921580d270
parent e518a5d38e7587bf2f626e93b2d288bf150c2eb6
author Bob Badour <bbadour@google.com> 1648778384 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1648778384 +0000

Merge "Non-module target." am: e518a5d38e

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/2052094

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