| commit | 68be95ef4c5fef30cea957825f5a7bb1a2f44d0f | [log] [tgz] |
|---|---|---|
| author | Raphael <raphael@google.com> | Thu Mar 31 16:51:28 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Mar 31 16:51:28 2011 -0700 |
| tree | fc4842fee42447ec7ada080ca602118673de8345 | |
| parent | 29930470bab33e37493a7f894088a2ad972fefa1 [diff] | |
| parent | ff5d4db8bd84a1accbbc81585fdb03ba21fdfb60 [diff] |
am ff5d4db8: (-s ours) am b2d8f0ee: (-s ours) am 31d15b9f: Merge 48023786cf63fc4ca90d0c3876d0d578c07d2f68: \'Generate SDK Repository XML.\' Do not merge. * commit 'ff5d4db8bd84a1accbbc81585fdb03ba21fdfb60': Merge 48023786cf63fc4ca90d0c3876d0d578c07d2f68: 'Generate SDK Repository XML.' Do not merge.