OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Nov 2010 03:41:51 +0000 (19:41 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 29 Nov 2010 03:41:51 +0000 (19:41 -0800)
commit4d9ae25b125501123098734ead379c8c4fbd1012
tree42c1460c1ae73637ca87b3b45d1165b80554ddfe
parent8a9bcc0757cc054bc1a4a68f9077e52e8fbfacc3
parent425a37a600cbd76838a29182ae3f7e1bc1dd00f5
merge from open-source master

Change-Id: Iac4c66859768cc745b274985a19accb6273e9320