OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 20:38:55 +0000 (13:38 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 14 May 2010 20:38:55 +0000 (13:38 -0700)
commit9514fca5c78c85b6f5e2d2497b05bbea2613daa8
tree87f368dbbf241ce235a4ba9d311177add710d6fb
parentf7c634216e673407f5a7a879bcf2ddb2454e4670
parent5eac957bddff48437bdc1ffb212b825d2b74556a
merge from open-source master

Change-Id: Ia4cb27645bfd757fb75273ff5a6cbf3af57b3a03