am 7a8e0399: (-s ours) am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge."
* commit '7a8e0399c6b8b0b02cd596d0949acc8364500887':
Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
This commit is contained in: