OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Aug 2010 21:59:51 +0000 (14:59 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 31 Aug 2010 21:59:51 +0000 (14:59 -0700)
commit8756608bb6328eaa3b157fa5935b74835e397eb2
tree171cc29547d0ae915fe6807d6f3619aa1775fecb
parent465b5ec74f5cfb9ec276b20df71adc951190f04c
parentb095d19e75250fe02f49a32b556446e4ccc45a67
merge from open-source master

Change-Id: If9dd02177b9e33556969be3b8eda46a362a424a6