OSDN Git Service

am e4b9834f: am 6de3a6fd: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 4 May 2010 16:29:27 +0000 (09:29 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 4 May 2010 16:29:27 +0000 (09:29 -0700)

Trivial merge