OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 12 Jan 2012 16:56:04 +0000 (08:56 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 12 Jan 2012 16:56:04 +0000 (08:56 -0800)
commit6019f7b0954cdf2e9063087c94f825778a6feda0
tree64a8d902cfff1eec10af0b5739acdb6ac85d4fc2
parent5c26786314c934819d460fb565be200ee8894ed0
parent6add6c759ab3107c5b87eb0d4d9ec41b7d966252
Reconcile with ics-mr1-release

Change-Id: I8aa81509837cca423f8ac241d97e45d822086acf