OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Tue, 9 Aug 2011 20:18:54 +0000 (13:18 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Tue, 9 Aug 2011 20:18:54 +0000 (13:18 -0700)
Change-Id: I53347883a596815648f9a57746fac7eb84629548


Trivial merge