tree a686c4d9a0b3c581a5cda314cd6f782cea2b3284
parent 4ad625ea8c81b52698a490578676873ded810bf0
parent 982b02c44243591ea3e1cfa3cc417882f1407fc1
author Charles Mendis <cmendis@google.com> 1257574336 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257574336 -0800

am 638d8653: Merge change I47ef4266 into eclair

Merge commit '638d86535264b24b54698fca7e18e68571fe0bad' into eclair-mr2

* commit '638d86535264b24b54698fca7e18e68571fe0bad':
  Expose WallpaperSettingsActivity in the public API.