OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Aug 2010 21:59:51 +0000 (14:59 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Aug 2010 21:59:51 +0000 (14:59 -0700)
Change-Id: If9dd02177b9e33556969be3b8eda46a362a424a6


Trivial merge