tree ab33012f6fbc66edb962269db1d8fca0011bca77
parent e5cae493fe3bd7cf5692681fd13ceccab91375ee
parent 30cfbf22eb3280b2009bb8cfd029b8dfdc7dd32a
author Dan Albert <danalbert@google.com> 1650485959 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1650485959 +0000

Merge changes from topic "abigail-werror" am: e31a071389 am: 30cfbf22eb

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

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