OSDN Git Service

am c8652199: merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 28 Apr 2010 22:54:35 +0000 (15:54 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 28 Apr 2010 22:54:35 +0000 (15:54 -0700)
commit62e14af34c9c21315e5b6b870c80bd680b63faff
treed2c373cf5af743810228834e5755d0a33aac81cf
parentc148df234313742cd8cfae1368333fff2bb1be2d
parent658e62322dc0cc9b66582351e87373b0712eb5c7
am c8652199: merge from open-source master

Merge commit 'c8652199d14dc42edf882a8eb9e48a5fe0b6101d' into kraken

* commit 'c8652199d14dc42edf882a8eb9e48a5fe0b6101d':
  speling fix