OSDN Git Service

am 5482eca1: am 032ae72e: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 14:42:37 +0000 (07:42 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Jun 2010 14:42:37 +0000 (07:42 -0700)
commit451eb3b9b2e81a3512d86c819fc19ade7824fa65
tree176c95f6d413b5a1dc770dd411e396d029cee462
parent99dd14ff0da23f1aa4b0d9ac449b487fcc0eee1d
parent5482eca13aa6070e098afb35c91401e3dbd7ced2
am 5482eca1: am 032ae72e: merge from open-source master