OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 6 Nov 2010 01:14:03 +0000 (18:14 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 6 Nov 2010 01:14:03 +0000 (18:14 -0700)
commit15af2999bfd376e38921fe8553f148888953eb38
tree438f5f25de74c194c07bdcea44c1941ed6b925a6
parent80a5962d7b18f289fedebf168868b670ef3bf36b
parente873242bee96bcb9b5ab248471718dfca4b42a1b
merge from open-source master

Change-Id: I82e33d808bac10d4f63b5379ee9367091865fde3