Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:19:18 +0000 (13:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:19:18 +0000 (13:19 -0700)
Change-Id: I08373a62e00ccc78cb09e193dd1c90a36daf50d9


Trivial merge