tree 2534e89b103d2b360b65234ed863614ca1b568eb
parent 05cee446bf3100a8a08ee1c2ab1a97bd26881755
parent 68805280f05f831bb44d21a2bf3c062f3343f99b
author Patrice Arruda <patricearruda@google.com> 1601490834 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601490834 +0000

resolve merge conflicts of 64d43056ace73e9cc34b6bd2885185af2495633d to rvc-dev am: 68805280f0

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

Change-Id: I809d86b85f8f796c1b24c4a7718045e357f661be