OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Thu, 18 Aug 2011 23:03:01 +0000 (16:03 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Thu, 18 Aug 2011 23:03:01 +0000 (16:03 -0700)
Change-Id: I929f43afc75c509dbcdd862c31306005d5228972


Trivial merge