OSDN Git Service

am 81367cb4: am 542b8f2b: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 May 2010 17:42:17 +0000 (10:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 12 May 2010 17:42:17 +0000 (10:42 -0700)

Trivial merge