OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 15:41:59 +0000 (08:41 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 2 Jun 2010 15:41:59 +0000 (08:41 -0700)
commitc99c7120c34c8cc6715ffe02a66ff500ab2bc508
tree2e6c7cfa32c293f7fd4aa65eb772567fe6465e65
parent7c7eadeb4f72878bbbb76e3353767985ed024033
parentf3998f6abc4e0e1cc502bf82f78298a238c340ba
merge from open-source master

Change-Id: Ife78a3e7582be1853d28bbcef41f5d06f3b97ef6