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)
commitd48025be4b87ad5203b40d5a4d1307016035ce5c
tree8cfbdd12e8c610b0859ad35ef37507605313a648
parent693ac9c9d39ca4744aa555dfec85341cc311ca73
parent978980f79f6fb8cd5a08dfdaf6426cc7b2531c28
merge from open-source master

Change-Id: I10e9ec18dedd9196d1f33378abec63ddb65407af