OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Mar 2010 23:13:27 +0000 (16:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 22 Mar 2010 23:13:27 +0000 (16:13 -0700)
commit98d2e4fcec7869ff264bec821a374fd494a223d6
treef32eccfeff4ea139adf4d13ef1e35da946e97738
parent1da49e45a8b5c656a364f0fad42b92fd4dd18b59
parenta2d776b2d36b38d94a30fc5692fd71ce9697fe9c
merge from open-source master

Change-Id: I6d111015c27324b9ae94ac4701ba1a7187f97ee8