OSDN Git Service

am 1d168621: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:40:08 +0000 (14:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Mar 2010 21:40:08 +0000 (14:40 -0700)

Trivial merge