OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 20 Nov 2010 04:43:37 +0000 (20:43 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 20 Nov 2010 04:43:37 +0000 (20:43 -0800)
commit1d6d74b348089f9a5d6a9680033a78a51d22ea53
treea6a031b029d9628cde9909ca015e0bff4c2fd6dc
parentc924beeb9942ac696b0d3ab182e963e35a146c50
parent476a6e18ba87159b34fabb8a0bd73abb804c5079
merge from open-source master

Change-Id: I9233097052d1559e620c54a6450eb59e5f6d70e1