OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:01:45 +0000 (14:01 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:01:45 +0000 (14:01 -0700)
commit45ef27a260c9a2d7619bd26e879313fe6733fd41
treec618308f3d2ab6e6abd0e25c71cec46daede8532
parentff46e2eed3c14eb68580e3bce2ddc206b87eb835
parentecf9b681121d15758b84113c90f3b17697b44a47
merge from open-source master

Change-Id: I627b3a7080e413f756d1751cdae88ec6642b02c4