OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Apr 2010 17:47:43 +0000 (10:47 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Apr 2010 17:47:43 +0000 (10:47 -0700)
commit28739a81dbdeb046adc9e31ffadbe65cb45563b3
tree447a8a14f1ed44c8401c95966a8620549741b26e
parentb678f3bb6c3fa3cc88cda872909ace5791a6304c
parent818e4bcaa66ca462ca874e4d6e5dbc1041d50775
merge from open-source master

Change-Id: I33605ebb36f1978e1c4715f6688074c808981c8d