OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 21:12:07 +0000 (14:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Aug 2010 21:12:07 +0000 (14:12 -0700)
commit968e2cdf1e8be272d6905370bcf7e30b8cb4e184
treea9ecac8aba96f98cc982411bd83dc651ddce0bc3
parent1a34ff5ec360aca0763c4802940223aa45532595
parentad578ac1756c96a0dbf520867b9c9c95bd366b6f
merge from open-source master

Change-Id: Iaf2f7de891f78af2eddd7a5edc6e8d5bcc4e0b48