OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Nov 2011 16:22:50 +0000 (08:22 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 7 Nov 2011 16:22:51 +0000 (08:22 -0800)
Change-Id: If02ce708d74c5d627e4e6f83cfc5ee003fb42b58


Trivial merge