OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 15 Jun 2010 16:30:31 +0000 (09:30 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 15 Jun 2010 16:30:31 +0000 (09:30 -0700)
Change-Id: I405069e9495e43fdcdedc41efce77d43a291272c


Trivial merge