OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 00:13:34 +0000 (17:13 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 00:13:34 +0000 (17:13 -0700)
commitcf729a8b5f1c06def6771f4aaf187eb0f12a1852
treea52b3c72f32e4a2323418e0004eedf06a99f8d3f
parent6263754a20fd2f8d67a32c155f3597c6aaa2cafe
parentf79353920132f81e24f47ebddbbf8ecbabbc3135
merge from open-source master

Change-Id: Iabc452eebbf351155e9886ae945cb18cc0a22ae0