OSDN Git Service

am d2203aa0: am 1beb43af: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 22 Apr 2010 20:39:14 +0000 (13:39 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 22 Apr 2010 20:39:14 +0000 (13:39 -0700)

Trivial merge