OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:44:22 +0000 (07:44 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 7 Dec 2011 15:44:22 +0000 (07:44 -0800)
commit6bc8adeadf95203954a134769eaa217d62ba975c
tree9cf7177626b54612e09d349c2c5c21e3da7620c6
parent217d885573d2088fbd7cfb1f0c9a67f4000c1b6a
parent43e70ba73e63284605a6ef30d3f0a0e8371bb10c
Reconcile with ics-mr1-release

Change-Id: Ib6c72245d2135fe255c5dada01754cb5e03d761c