OSDN Git Service

merge from open-source master
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Dec 2010 00:06:47 +0000 (16:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 2 Dec 2010 00:06:47 +0000 (16:06 -0800)
commit9f4023f3ee2f1a63ea7ad33678d235020e9729a9
tree8aa95628c1a001069c3e5b42c470163d8d785ab5
parentb50bd9ea1d7aa7d52c4cdaa188b1b7f240c02429
parent9f5b679f381487082a779672d003b1083e116fc3
merge from open-source master

Change-Id: Ifea6128a9dc6899797611782e79f549ee8b0edd7