tree 80c1eb73213e2916ada979fb1d0d04b3a10009af
parent c4e0a22a5f1f123d93283bc5f21047e87d3c7e3b
parent eca41b31fb9a5202f755bfd9dbc4849dbb486137
author Daniel Sandler <dsandler@google.com> 1257454839 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1257454839 -0800

am eca41b31: Merge change Id1458b01 into eclair

Merge commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137' into eclair-plus-aosp

* commit 'eca41b31fb9a5202f755bfd9dbc4849dbb486137':
  New live wallpaper API to expose author and description strings.