am ff5d4db8: (-s ours) am b2d8f0ee: (-s ours) am 31d15b9f: Merge 48023786cf: \'Generate SDK Repository XML.\' Do not merge.

* commit 'ff5d4db8bd84a1accbbc81585fdb03ba21fdfb60':
  Merge 48023786cf: 'Generate SDK Repository XML.' Do not merge.
This commit is contained in:
Raphael
2011-03-31 16:51:28 -07:00
committed by Android Git Automerger

Diff Content Not Available