OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:28 +0000 (16:05 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 15 Dec 2011 00:05:28 +0000 (16:05 -0800)
commitefe3034c7107f80e99016bf1808cdfe1afe03e31
tree884ff4d5dedcb3b2bdcc4d2905c347353e49cdd1
parent80fa947b03cb1b86e82823e1c279a072704718cf
parent9b9360c421d89373fdef7f83f3f5ef69bb831f50
Reconcile with ics-mr1-release

Change-Id: I93d6301506cdc1b3f549b7cf4dbc8a8b3adeca2b