Skip to content
Commit 012c4ff2 authored by Sasha Smundak's avatar Sasha Smundak
Browse files

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

* aosp/upstream:
  Export CollapseDuplicateProperties, Soong writedocs uses it

Change-Id: Ib237ea5810b9793725d1b7f6c21286058413b2b7
Test: Manual
Bug: 120512870
parents 1387a00b d444506b
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment