OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 15:22:52 +0000 (08:22 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 15:22:52 +0000 (08:22 -0700)
Change-Id: Ib4394bc59cd66c0d8071c5dcb0d20543241b36c8


Trivial merge