tree 53dfbde3ae5fde79f060560b685a52194bcdc754
parent 3bdda8b2cbfcb25cb2db6c6abfb9899bb586f5eb
parent a83a864d3c71223d62494b8a187f5472e98f9729
author Colin Cross <ccross@android.com> 1570483702 -0700
committer android-build-merger <android-build-merger@google.com> 1570483702 -0700

Merge "Filter product variable property structs" am: 2334757d24 am: 362051eef3 am: 42a2bce227
am: a83a864d3c

Change-Id: I764ab8f8702d80258c77b10d123dd87896a19b76