OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 04:03:11 +0000 (20:03 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 04:03:11 +0000 (20:03 -0800)
commit4f7325849bad0c41f451ab177bac037c20f00de0
tree8e3d79f8b4eda0315e5d41b49386df6bc7a541cf
parent5b08f6499a2bcd97ec88ae2719edb90d025cd298
parent2fc113de8a0cd216f96977b3b08d6cfa4f140c6c
Reconcile with ics-mr1-release

Change-Id: I4518215eb5788221551703ab02142d909644c1a7