Commit 322c5095 authored by Ryan Longair's avatar Ryan Longair Committed by Android (Google) Code Review
Browse files

Merge changes from topic "am-b4c20c17-d3c6-4a60-8bbc-1856c0a225e7" into oc-dev 

* changes:
  [automerger] Support for build prop collection in STS for APFE integration am: d2b2aa35 am: fd8e14ff am: 69d82611 am: 77b67755 am: 7d23aab0
  [automerger] Support for build prop collection in STS for APFE integration am: d2b2aa35 am: fd8e14ff am: 69d82611 am: 77b67755
  [automerger] Support for build prop collection in STS for APFE integration am: d2b2aa35 am: fd8e14ff am: 69d82611
  [automerger] Support for build prop collection in STS for APFE integration am: d2b2aa35 am: fd8e14ff
  [automerger] Support for build prop collection in STS for APFE integration am: d2b2aa35
  Support for build prop collection in STS for APFE integration
parents 7d18b386 74abb136
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment