OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:11:47 +0000 (10:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 1 Mar 2012 18:11:48 +0000 (10:11 -0800)
Change-Id: I0dd6896813e61ae5168134d6018dc96bd41008e8


Trivial merge