OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Mar 2010 23:36:32 +0000 (16:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 19 Mar 2010 23:36:32 +0000 (16:36 -0700)
Change-Id: I23af6296f0867bea2a2da72d4eb3dda93025b1ac


Trivial merge