OSDN Git Service

Reconcile with ics-mr0-release ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:43 +0000 (10:21 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:21:43 +0000 (10:21 -0800)
Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c


Trivial merge