OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 15:11:09 +0000 (07:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 9 Dec 2011 15:11:10 +0000 (07:11 -0800)
commit254868809d7df841112209fcbf5c191cce013f81
treed8d69ce3df2f878f020f768ef96771561ea00619
parent1da7ad123ccee937a52b833d80ea8ddf462ad9a3
parent0de434f36f7610e6652604f4b7ca7c778757eeac
Reconcile with ics-mr1-release

Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7