OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Oct 2010 18:03:48 +0000 (11:03 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Oct 2010 18:03:48 +0000 (11:03 -0700)
commit581a3deb6bdb87521b08514d4ed71dc6eb6e87a8
tree33b6de811b1f10bc660eb4c06e431d2b3c885bfa
parent26e0d08a96199c76ecaba8c9bc8463d248a09cb1
parentb46b7afb655c32ede3b686fcc0b248bedb43f84d
merge from open-source master

Change-Id: I40792602007ee77f51b8d4cfcf1ab1daced63785