OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 23:05:42 +0000 (15:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 12 Nov 2010 23:05:42 +0000 (15:05 -0800)
commit6fd088adb11b8417ec8bb94be3079e29dbfd5f1b
treeb08ebafd91e02ee6314a07911963c166cf1026d0
parentb324086a200ac0265d0482b15628428e8eeefea6
parent018d55a5f1d7316e9a79a31cbceebfe3a946d943
merge from open-source master

Change-Id: I9316d9dc8a881072f409f72f816bcc89bfb76910