OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 01:02:15 +0000 (18:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 14 Sep 2010 01:02:15 +0000 (18:02 -0700)
Change-Id: I9da203c9724e3fa8026dcb1ca4c8d0e365b5caad


Trivial merge