OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Dec 2011 17:02:57 +0000 (09:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Dec 2011 17:02:58 +0000 (09:02 -0800)
commit174f973c2c68f6ccff4b723f5645ce4d96b8535e
treea4f7155e7d0e10895947a985fd9e447a72f9a5a0
parent441fbe0a4aa822642ab48d947bdb62a2bc867e74
parent201a78f7022c6cbd1fff9ccdfd839e1b5f534410
Reconcile with ics-mr1-release

Change-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516