OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 23:41:39 +0000 (15:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 23:41:39 +0000 (15:41 -0800)
commitc83cbc93266aa4567fc31bd8b3da5f21e9f3dfcf
treea269807b725206cd6da8b615954913017a35dfa4
parent6fd088adb11b8417ec8bb94be3079e29dbfd5f1b
parent3d84e67e31e154d287c0be34bbabdbed66c37396
merge from open-source master

Change-Id: Ia3bcf17daf1dfce952dadf286562b6328a39da7c