OSDN Git Service

am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into...
authorDaniel Sandler <dsandler@android.com>
Thu, 1 Dec 2011 14:31:09 +0000 (06:31 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 1 Dec 2011 14:31:09 +0000 (06:31 -0800)
commitf2e05f17505f318fed38bc161e3241c31f23f678
tree60a86919e626e09690310f1a42282c82c53f52ac
parent9d735cbfd6aacb16055a8b870276666a2430ff2c
parent859cdf2328ddfc518cf63576654c76182f9ee771
am 2a40d0d9: Merge "Put screensavers back in the icebox for now. DO NOT MERGE." into ics-mr1

* commit '2a40d0d92b208021b492e9af3d944720cbf269fc':
  Put screensavers back in the icebox for now. DO NOT MERGE.