OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 14:50:16 +0000 (06:50 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 14:50:16 +0000 (06:50 -0800)
commitcd197842b6b17c16b01b0f3608f7177faa5ab505
tree758656cae91cbd61f0ab7f7dc48255382ca20d14
parent381581613aab988acc6f9d5b459fd4f533d8c2a5
parent00d48ec3e00ae369c56f417ca380f4f6c4dee2ff
Reconcile with ics-mr1-release

Change-Id: I623e25d55ed00b150729425f710ca52af2de7913