OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 23 Nov 2010 18:35:25 +0000 (10:35 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 23 Nov 2010 18:35:25 +0000 (10:35 -0800)
Change-Id: If699b3e30843890c08e9f5a31fb5c1305cc6ae9e


Trivial merge