OSDN Git Service

Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks...
authorXavier Ducrohet <xav@android.com>
Wed, 20 Jan 2010 00:35:00 +0000 (16:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 20 Jan 2010 00:35:00 +0000 (16:35 -0800)

Trivial merge