OSDN Git Service

am b6c756d5: am 50c7f2d9: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 19 May 2010 16:17:07 +0000 (09:17 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 19 May 2010 16:17:07 +0000 (09:17 -0700)

Trivial merge