OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Jan 2012 18:25:20 +0000 (10:25 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 20 Jan 2012 18:25:20 +0000 (10:25 -0800)
commitc541cd6ecb59fdaa339585c48395d06ccd03867e
treedd72617f6d29970534758b8924b99348985a0997
parentc9054b11fa3895fe70b2eaba849c6388df449c1e
parent94e1e3b9141f380a789988754753702a16cf5930
Reconcile with ics-mr1-release

Change-Id: I3bdc5d19073e63e031b684bede64b1f5ebdf13e7