OSDN Git Service

am 08a42a05: am 9867f949: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:50:35 +0000 (07:50 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Jun 2010 14:50:35 +0000 (07:50 -0700)

Trivial merge