OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 30 Oct 2010 00:23:44 +0000 (17:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 30 Oct 2010 00:23:44 +0000 (17:23 -0700)
Change-Id: I59da9844f561bca215c90306f3942ad070d0a6d0


Trivial merge