OSDN Git Service

am 860728a3: am e5ab92a2: am cf6ab741: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 3 May 2010 23:20:41 +0000 (16:20 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 3 May 2010 23:20:41 +0000 (16:20 -0700)

Trivial merge