OSDN Git Service

am 1d168621: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 31 Mar 2010 21:40:08 +0000 (14:40 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Mar 2010 21:40:08 +0000 (14:40 -0700)
commit7cc7433f4a71fcc9c1a3ece3669588c9318e2619
tree49d3efa35e9473b0150046fed837791ae0c70d81
parent717cd61a1ba99b58934b3b9f6c9e4a45949edc09
parent1d168621a524e3937cd4e2a1cdec18a230b89a35
am 1d168621: merge from open-source master