OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Sep 2010 21:25:39 +0000 (14:25 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 24 Sep 2010 21:25:39 +0000 (14:25 -0700)
Change-Id: I7fee1fbea13a71ba6606b320c2cac13d7929f57e


Trivial merge