OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 28 Aug 2010 00:06:33 +0000 (17:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 28 Aug 2010 00:06:33 +0000 (17:06 -0700)
commit6f85530d44d5c9796df65ce16129b69dd6bcf85b
tree3b9f6df69f140c1a10f7423b1cdb4c9fb7a7c4b3
parent9be857b272fb2aaf75acfe910533e67579bad7d6
parentc8079b0edde6c191fdca26f2c7ac49ce3bdf7a91
merge from open-source master

Change-Id: Ifa20cdcd375572a81e3c1232994c1ea31840dc60