OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Oct 2011 20:05:00 +0000 (13:05 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Oct 2011 20:05:02 +0000 (13:05 -0700)
commit0393a5366e080dad0fec2e431a20ee34518f7bb5
treeb7a76062aa4ef79f679e6a510a19e311ea2cc8a1
parent682967e1eef28e5a4d8e0cc1076ef9d4be9bdfc5
parentb5a2406e97b86dca920ef94fb361f6235c0f7f71
Reconcile with ics-mr0-release

Change-Id: I531ca70758d587d3f5d540a033009e2dffeaf301