OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Sep 2010 21:38:28 +0000 (14:38 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 15 Sep 2010 21:38:28 +0000 (14:38 -0700)
commitbbbad3ab1322cd9283e425bb115eeac987d8b810
tree56927c0b5e05f439e7affb6af3db05d60b6ac687
parent04c8f5551de9a0c4d23a558677562f0d69561964
parentcd026a71666bf1508f66c4caf059d4e3180f5d6a
merge from open-source master

Change-Id: I370b33be17b5a286ed477a85845534b1bd462750