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)
commitc50480791ba002f3a77a870c9dea8416ee924c8f
tree6a3dcfe5e1ffcc3d3f839e19ded8b645f352f51e
parent2013d4d159bfc29b4143d3b5fd4735f51a03684c
parent5f14e44ef801dd2c3e35f816bdc8c709482d8ebb
Reconcile with ics-mr1-release

Change-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516