OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Mar 2010 01:14:25 +0000 (17:14 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 9 Mar 2010 01:14:25 +0000 (17:14 -0800)
commit975b1cb2d99830acb31179f30e11bcfd6ee2ee05
treed5498abfdf783d96c1e6472186107f76c257a2f9
parent08e65b9ebd13db75a7247bbd55d69c29e4fd9448
parentb206c77531b7554b880292c88d895b5afb8dbfb7
merge from open-source master

Change-Id: I66d3db4c9ed3f54ce17a8d64ca0c6cce6941cdaa