OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Nov 2010 00:31:00 +0000 (17:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 5 Nov 2010 00:31:00 +0000 (17:31 -0700)
Change-Id: I22daa7f51698f7a4f873f7c52a10845e2cd9f097


Trivial merge