OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Jan 2012 15:45:15 +0000 (07:45 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 5 Jan 2012 15:45:15 +0000 (07:45 -0800)
commit943f9a58a3eb3240c8a85efa49a25a77282f5d48
tree9b8fa1225d4924738c1c311d29dd57177f86bd03
parent1964c8ed2d6b1981ee991b5ecd95ab711affdf62
parentee0472e8a561df12f86863446c7738f71c37fca8
Reconcile with ics-mr1-release

Change-Id: Iaa3637a3db5b9f2c8c4721a8ea2cb230336753f5