Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:46 +0000 (08:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:46 +0000 (08:49 -0800)
Change-Id: I35a0a0f15feed2406d60d77de84f0c4d13f0fb9e


Trivial merge