OSDN Git Service

am bc3a44f1: (-s ours) am 6a500a1d: DO NOT MERGE. Port Froyo livewallpaper support...
authorJason Sams <rjsams@android.com>
Fri, 12 Feb 2010 19:33:23 +0000 (11:33 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 12 Feb 2010 19:33:23 +0000 (11:33 -0800)
Merge commit 'bc3a44f18d2908047443f18fd3d3f54c33b09f7a'

* commit 'bc3a44f18d2908047443f18fd3d3f54c33b09f7a':
  DO NOT MERGE.  Port Froyo livewallpaper support to eclair for droid..


Trivial merge