OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 26 Mar 2012 16:47:10 +0000 (09:47 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 26 Mar 2012 16:47:10 +0000 (09:47 -0700)
Change-Id: I9be3678a1dc959923c5eb572e2b6f8243c446157


Trivial merge