OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Fri, 19 Aug 2011 23:44:59 +0000 (16:44 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Fri, 19 Aug 2011 23:44:59 +0000 (16:44 -0700)
Change-Id: Ib5266e2b1538057f5859ec61ee8f3c4531acfa32


Trivial merge