tree b2c2ab83d8c23a0922d4b37ce20c363ed2536ff5
parent cfae2075c68b23c76ae94a829c2ae292a4d0a113
parent a890cc7c97848bb2d58f38f0b92051582f732f87
author Badhri Jagan Sridharan <badhri@google.com> 1553648634 -0700
committer android-build-merger <android-build-merger@google.com> 1553648634 -0700

Merge "Fix missing combination check SINK/DEVICE" am: 25a7e6ed25
am: a890cc7c97

Change-Id: I284e113c8f0154032dc54fd3e2053aefa5f78503