OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Sep 2010 23:27:14 +0000 (16:27 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 7 Sep 2010 23:27:14 +0000 (16:27 -0700)
commit63f663ca0b9de35a34c25f61b99a28876f04476a
tree093d828555e066f953e7a9b11df0f35710803d45
parent1f6505c143b900793fc80696f44fa7a9a775796e
parentec79471c5179c4053b22dffab67484b3627d7330
merge from open-source master

Change-Id: I3941348e7467354f462ce2980a51caf560245342