OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Aug 2010 18:02:25 +0000 (11:02 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Aug 2010 18:02:25 +0000 (11:02 -0700)
Change-Id: I96edec07df6843984515ff92d3636434397a9d7e


Trivial merge