OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:15 +0000 (10:22 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 8 Dec 2011 18:22:15 +0000 (10:22 -0800)
commit520b7ee0f0f3e0b1e2424f64a0c0912d4c19bf19
treee4633ac9d216996e39631c0d4183b488f5fcf149
parenta8e684f5da3e761debf8ae93ecdb63a8d9e3c7a3
parent8da14d2f31f538832e1613037d932d48fb49be6e
Reconcile with ics-mr1-release

Change-Id: I3ff57eb4e0a33e875d39ce06a12f6809bc5f50db