tree 3c22e361a5b6c9266a1915b653d1103081214c40
parent 464e5f720c028a63ddc44caa87f649d7ba3705ed
parent a02a0d012c6d2b9571fb1ddf046bf3d75b9c806c
author Treehugger Robot <treehugger-gerrit@google.com> 1595017962 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1595017962 +0000

Merge changes Ide9c7a6a,I706c1433 am: f8b85dedde am: a02a0d012c

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

Change-Id: I5fb0dafda5d1547c96b6196cfe6eecf4618a16be