OSDN Git Service

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


Trivial merge