am 86f738ab: am 473fad03: (-s ours) Merge "Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge."

* commit '86f738abccb61c820d50a3a50d1fd1f0f2745c84':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
This commit is contained in:
Raphael
2011-03-24 22:44:03 -07:00
committed by Android Git Automerger

Diff Content Not Available