tree 0905a81f4152b5c9dc476980aa0b8304c225fb5c
parent 87da860616009a86e260e49bbefffe12c1a06607
parent 859f455645bc49e32330108b1ea9f85ffb80a2cd
author Dirk Dougherty <ddougherty@google.com> 1265769858 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1265769858 -0800

am 859f4556: Merge "Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper." into eclair

Merge commit '859f455645bc49e32330108b1ea9f85ffb80a2cd' into eclair-plus-aosp

* commit '859f455645bc49e32330108b1ea9f85ffb80a2cd':
  Add generated html docs for SampleSyncAdapter and CubeLiveWallpaper. Add article for live wallpaper.