OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Oct 2010 23:07:19 +0000 (16:07 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Oct 2010 23:07:19 +0000 (16:07 -0700)
commitce9bfb475e170a7b3abf8e817fadf2cfd5678093
tree572011a09a3f735a383c3d36f9239731df8cc8ee
parentc745347efe3e50623f744d5e422a71ab8bff3a5e
parent5365ea47c9ded18d45795c4a9dad6f9627e9ac95
merge from open-source master

Change-Id: Ie00989060f41e743583d77e33af4bd680fb8296b