OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Sep 2010 18:47:48 +0000 (11:47 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Sep 2010 18:47:48 +0000 (11:47 -0700)
commit69f2d38caeb1f2540ec01b9374919d5e5c790ee0
treeed4c92064881c2f3eedadc8364b5b3356a99d5b1
parent9828997d7808bc107ebca97b31523ce9c7084216
parent4fb194e77970aa935067c589c90a6a6e03d3e6ea
merge from open-source master

Change-Id: Ic83e9d9494c6d6ff143940b8d38a10e928821dbe