OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Oct 2010 20:36:11 +0000 (13:36 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 19 Oct 2010 20:36:11 +0000 (13:36 -0700)
Change-Id: I10e9ec18dedd9196d1f33378abec63ddb65407af


Trivial merge