tree 1c991b824ed99d6eb31e2c1ab398b0eda57e07cf
parent a67e8c98e49d47bd1ad3efc8c8158ad55295b64d
parent 2f55f24c4634f81dbe8c104f86f9c3d7ac95373f
author Colin Cross <ccross@android.com> 1569535183 -0700
committer Colin Cross <ccross@android.com> 1569535183 -0700

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

* aosp/upstream:
  Add proptools.FilterPropertyStruct
  Make CreateModule return the newly created module
  Add proptools.Int and proptools.IntDefault

Test: m checkbuild
Change-Id: I4bbd45be12794c1a8575799950772d4ecd272628