OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Jul 2010 18:40:01 +0000 (11:40 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 2 Jul 2010 18:40:01 +0000 (11:40 -0700)
Change-Id: I895b74454b35da7eba6c0f6250fe2ca6c9907f1d


Trivial merge