OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sun, 10 Oct 2010 20:56:19 +0000 (13:56 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sun, 10 Oct 2010 20:56:19 +0000 (13:56 -0700)
Change-Id: I94c5a64731eff54534bd729ee8cdd3437da524ca


Trivial merge