OSDN Git Service

am fdf2454d: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 20:43:56 +0000 (13:43 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 14 May 2010 20:43:56 +0000 (13:43 -0700)
commitac65d2f600a829ca6bf0385352c1900fcc4d0698
treebfe284782604ae2360d63df9c36247f26e0192f5
parent1e5db2794b72cad45ca65db9065c6ae495a0204f
parentfdf2454db21284b5e1ec23cb18724388c85fd975
am fdf2454d: merge from open-source master