OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 17 Nov 2010 22:31:07 +0000 (14:31 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 17 Nov 2010 22:31:07 +0000 (14:31 -0800)
commitc417ccf35dec76cb45f26d446114e4a12a461b16
tree9fde87fc9dc4b6413d20d99dda10f69cb9be0846
parent7bc03f4ed6d0748e6ccea8abff391176d1f2f7df
parente79b1df30e4e6bf03540259c670f9ff3c018e1ca
merge from open-source master

Change-Id: I4dd20b129dca8473d5da7f6b84d90f8674a6bbb1