OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 25 Feb 2010 22:54:51 +0000 (14:54 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 25 Feb 2010 22:54:51 +0000 (14:54 -0800)
commitfc7028f1c68dcc8d59c8e4daf4a8917a3d9a7558
tree18968d0f79ea8ad4ab7ef03b9a26650e0a001737
parent563d3a62f3762b312a4c0a9d9af15a2333beaede
parent853226b147fb7be7709ce55e7100ebfea6719435
merge from open-source master