OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Aug 2010 20:18:46 +0000 (13:18 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Aug 2010 20:18:46 +0000 (13:18 -0700)
commit465b5ec74f5cfb9ec276b20df71adc951190f04c
treed469e8f3b3c5faa0c541eebbe9febc37c46f2cb6
parent86978fec9975926d2ad3ffeaabc8496ebd097e08
parentba6508c7edcd34d9daa8bc373d44040e13072b01
merge from open-source master

Change-Id: Id6d2e8d96b34ecbdd611c7eb19d0bb62655f888a