tree 28e47893fdcfc2f8b3dc0e27683eeda25c4fb956
parent 450c4f565a52ffc11d2239c86ea3f4568198e8ee
parent 0c4d1db0a0fd0affb77a9175872256ba4eea1524
author Colin Cross <ccross@android.com> 1579638910 -0800
committer Colin Cross <ccross@android.com> 1579716596 +0000

Merge remote-tracking branch 'aosp/upstream' into master

* aosp/upstream:
  Remove blueprint:"filter(*)" tag support
  Make FilterPropertyStructSharded smarter

Bug: 146234651
Test: m checkbuild
Change-Id: Ib3de8d8dd43e6354c17f1734705a9feb2ca7f701