OSDN Git Service

am 54709cb2: am bf11852a: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 4 Jun 2010 21:03:54 +0000 (14:03 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 4 Jun 2010 21:03:54 +0000 (14:03 -0700)

Trivial merge