tree 9ee5973ce9776653039b1561da79d4ce480382a0
parent 365eb053640095dd63da84a4808dae76c09f1354
parent 13353526bacc510020f17e5b5bd42322f60458b7
author Yu Wu <yuwu@google.com> 1607369844 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1607369844 +0000

Merge "Cherrypick from: https://android-review.googlesource.com/c/platform/build/soong/+/1463105" into mainline-prod