OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:08 +0000 (10:22 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:08 +0000 (10:22 -0800)
commitaf9565aa8be0136463ec549d9d3abdd906d2c390
tree1141381d10eb503ad34130bd057d853bd21f439c
parentc16ac09f510437e8340be691720177a490ae78f0
parent153d0f1a27e0a157cabb6ca9d0d88248630f5695
Reconcile with ics-mr1-release

Change-Id: Ifb9dad264079f0a566dd978dd56414fbaf59b9e0