OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Oct 2010 00:57:53 +0000 (17:57 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 11 Oct 2010 00:57:53 +0000 (17:57 -0700)
commit7f15ccfb3b46c7d2c3bb3326dadd8112c771e862
tree4a40883d3cff8462c15372c9c658d20b3ac09eb9
parentcfdc845372740499f5e2f925e23040e1b3ad8966
parentdec7b41054d146a04ac4bda402644c9cccdcbdc2
merge from open-source master

Change-Id: I02ef9a007aa700fa22e774b9e7d24c7eacaf5d48