OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Feb 2010 18:03:02 +0000 (10:03 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 11 Feb 2010 18:03:02 +0000 (10:03 -0800)
commit6e03ece9c9bafb7ce8507b384d575e745403c24b
treef4d901d22f470e7d421cde73033da6a191f7db17
parent8727c24cf230f6f071ab631a6ffdcb5f846ac8fa
parent54ab0ee5b33233d5d4f752742f4fa6a087620959
merge from open-source master