OSDN Git Service

am 5ef5272b: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Apr 2010 16:24:08 +0000 (09:24 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 21 Apr 2010 16:24:08 +0000 (09:24 -0700)

Trivial merge