Commit 0376de27 authored May 06, 2016 by Colin Cross Committed by android-build-merger May 06, 2016

Merge remote-tracking branch \'aosp/upstream\' into master am: 3d5a0af8 am:...

Merge remote-tracking branch \'aosp/upstream\' into master am: 3d5a0af8 am: 0d0249c4 am: 8b06abde
am: e8bb635b

* commit 'e8bb635b':
  Support ExtendProperties that can append or prepend

Change-Id: Ib1347f94e4c3a19821f98b22971a15a4097eb14c

parents 2572ea94 e8bb635b

Show whitespace changes

Inline Side-by-side

Please to comment