OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 4 Sep 2010 00:12:30 +0000 (17:12 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 4 Sep 2010 00:12:30 +0000 (17:12 -0700)
commit8d0607721b90af3c8eecd484bda9931655060bd4
treeea4b40814d33f67398dea4f67d6f0abc96785f66
parent8e1bf59c68965f2edecd5c32be9ec54b5a487497
parentb81e6fc4f2e3600d1ca7abba27f7ef6405966e4f
merge from open-source master

Change-Id: I9d7eca2a536b4646767a7aa1afba2d86b865fb57