OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Nov 2010 04:57:09 +0000 (20:57 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 24 Nov 2010 04:57:09 +0000 (20:57 -0800)
Change-Id: I66a3b8c183bee0f8efc86f53a7dfd9004ed75867


Trivial merge