tree a8cb3dee7b3a91c4ca4ee52f699754c3817ce8ad
parent 81768cc9cc95a0e95dfddfa9c06bc4f3a487ff0f
parent 7790f714d5317b82b8d118d257b1d5994b6f123d
author TreeHugger Robot <treehugger-gerrit@google.com> 1603137448 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1603137448 +0000

Merge "resolve merge conflicts of e32b3847191e36891849c6fce8d21a718a0fd5b7 to rvc-dev" into rvc-dev am: 7790f714d5

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

Change-Id: I0b4a0274e5a8a78d2d8c5ad5359534a25135e4bf