OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 21:51:37 +0000 (13:51 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Feb 2010 21:51:37 +0000 (13:51 -0800)
commit609329541ac4c23a2a21b7d493c594c1b3d0c438
tree9fef9ccc26f2b7cb551b10015137e0737ba09f25
parentf06e372cf9be356721abfc32ff2752e452dcebbd
parent0c823a12e59fd3aadd9fdddc945d3068b9be018f
merge from open-source master
samples/CubeLiveWallpaper/AndroidManifest.xml