OSDN Git Service

am 5482eca1: am 032ae72e: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:42:37 +0000 (07:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Jun 2010 14:42:37 +0000 (07:42 -0700)

Trivial merge