OSDN Git Service

merge from open-source master
authorThe Android Open-Source Project <initial-contribution@android.com>
Tue, 2 Aug 2011 22:18:46 +0000 (15:18 -0700)
committerThe Android Open-Source Project <initial-contribution@android.com>
Tue, 2 Aug 2011 22:18:46 +0000 (15:18 -0700)
Change-Id: Ie9bb30a3e763bb1d5f83c6e18303ca7317279176


Trivial merge