OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:07:15 +0000 (13:07 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:07:15 +0000 (13:07 -0800)
commita201914b3b2f6910b4ce4d58a4f170d9ebaeb174
tree13987824a6eefa7df17a4a30546ca5171553cf1c
parentb210b1806c740bf66eb04eb8e8d8ee75c01652dd
parent41c2f3ee4fb15f9fbdc22b163dc97e06e2109a7d
Reconcile with ics-mr1-release

Change-Id: I2e12ef9428b2f10e7cc87199edfa090cb9c7167e