OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 27 Oct 2010 17:34:37 +0000 (10:34 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 27 Oct 2010 17:34:37 +0000 (10:34 -0700)
commit6e6f2ecd49cd3c6ab8b71f02573d081965548864
tree01df8b1a7c85cab37647a776413afdbefacf4518
parent228d408ef7274c0ee68df0da8b22a6fc82c1a22a
parent4cbcb723939751d7ae956bc2da1f6f64a4537472
merge from open-source master

Change-Id: I2bac468cca9b72403577ad60ed134e4429b7e0d1