Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:50:49 +0000 (08:50 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:50:49 +0000 (08:50 -0800)
commit55231bc588e71c23f9d6ac5a94e72e96c3825991
treed0806fb582fca54e82542697b0165dd6617f6ab9
parentf720bc684b1a8332eb4d5f8d25c5feaf7eb54433
parent3855dff9082b04a388f6cbf7a78b6b3ea519207f
Reconcile with ics-mr1-release

Change-Id: Ibd173b02bfba0a495cd0ec5df37154c269c87b91