OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Aug 2010 19:17:27 +0000 (12:17 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Aug 2010 19:17:27 +0000 (12:17 -0700)
Change-Id: I27fa3990283e4e1d4f3ca6433c955770fcffc3d0


Trivial merge