OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 13 Nov 2010 02:03:28 +0000 (18:03 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 13 Nov 2010 02:03:28 +0000 (18:03 -0800)
commitd9f75383939ac93c58eb1b365328222a6c970d20
tree904f785828b15c7e7828ae3f2a86818581a49681
parent932546a527c93fccfae51ba5ea1f00b436843c12
parent1bd9e3bba8d32f7dfdcb8dd5c005446c583690e5
merge from open-source master

Change-Id: I7d647ada32fc96e05b308d5abb7b4b41dbe7c035