OSDN Git Service

am 5a1f66aa: am ec92ec7c: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 May 2010 17:57:26 +0000 (10:57 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 18 May 2010 17:57:26 +0000 (10:57 -0700)

Trivial merge