Skip to content
Commit 0d0249c4 authored by colincross's avatar colincross Committed by android-build-merger
Browse files

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

am: 3d5a0af8

* commit '3d5a0af8':
  Support ExtendProperties that can append or prepend

Change-Id: I901ef7bc77c0358bf8ae4d18281b57092c2912cb
parents 8f08550e 3d5a0af8
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