OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 28 Aug 2010 03:56:56 +0000 (20:56 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 28 Aug 2010 03:56:56 +0000 (20:56 -0700)
Change-Id: I7bf17eca20569571fe1339e49df7f9ab6e2838bf


Trivial merge