OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 27 Sep 2010 19:59:34 +0000 (12:59 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 27 Sep 2010 19:59:34 +0000 (12:59 -0700)
Change-Id: I042d0153b76bd8b164a815165f80d29b4ed94df2


Trivial merge