OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 17 May 2010 17:22:35 +0000 (10:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 17 May 2010 17:22:35 +0000 (10:22 -0700)
Change-Id: I5804d8850f2d4fb7b5d5c53d51e153f7ced9646e


Trivial merge