OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 01:59:03 +0000 (18:59 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 9 Sep 2010 01:59:03 +0000 (18:59 -0700)
commitba584097e0b571b91f85c31b47745cacfc9c0e27
tree032a3fdb171d94a6edece17913d6fc55e4312ce0
parentc3695dcdbdaa61c3d5efca693ebfc5e55ff344c5
parent077468de25fadccf407a5264658d38019d32bb81
merge from open-source master

Change-Id: I19aead365e0e65b12dd92c0b9ae4b8cc8ff60bdf