tree ac6dfdfbaf4c7a895d93d3337bd85aedb6a24c64
parent 1387a00b5f8354a60dc0b77c7a51137d3c96ac08
parent d444506bf6383850531162839d09d854a4bba6e1
author Sasha Smundak <asmundak@google.com> 1550602546 -0800
committer Sasha Smundak <asmundak@google.com> 1550602634 -0800

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

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

Change-Id: Ib237ea5810b9793725d1b7f6c21286058413b2b7
Test: Manual
Bug: 120512870