OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Jan 2012 18:15:33 +0000 (10:15 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 23 Jan 2012 18:15:33 +0000 (10:15 -0800)
commit514751834753b30d37eae591ccce2e69e3468602
treedd72617f6d29970534758b8924b99348985a0997
parentc541cd6ecb59fdaa339585c48395d06ccd03867e
parentec87a474017fcaeb4cbddfe58980f5a7e0c37005
Reconcile with ics-mr1-release

Change-Id: I6e64890cacfdb167f2f0c7a5e3917284e391ce11