OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Oct 2010 18:55:34 +0000 (11:55 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 7 Oct 2010 18:55:34 +0000 (11:55 -0700)
Change-Id: Ib0241b6df43dae934d59089ff60fbf4125d4f6e1


Trivial merge