OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jan 2012 21:36:34 +0000 (13:36 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 30 Jan 2012 21:36:34 +0000 (13:36 -0800)
commitc58295bfa07615b81b9bf5784cb8e2dac79aded7
treecd67a6f089b6dbe9ca033dac2454ba56ad69e62f
parent11484788dd0c2ec9fce29c523a7748de34fb9b8a
parentcdb22f7bbe6a6456e572e06c7e579578d2075ccc
Reconcile with ics-mr1-release

Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2