OSDN Git Service

am fdf2454d: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 20:43:56 +0000 (13:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 May 2010 20:43:56 +0000 (13:43 -0700)

Trivial merge