OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 May 2010 16:33:50 +0000 (09:33 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 12 May 2010 16:33:50 +0000 (09:33 -0700)
commit0b53ac733c36e14a5e2e948393360bba00048ccb
treedb1accf059bff77aeb40157974b69acc377888fa
parent482eadeae85a1764b86133172d11364df6ce7227
parentd2bfade8f6db2710c7d016ce70a6c2418d0ca0fc
merge from open-source master

Change-Id: Iab9eddbfea000b9403c92a211c37b93772f2a9c7