OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:06:18 +0000 (13:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 31 Oct 2011 20:06:18 +0000 (13:06 -0700)
commitadb70c57c265f8e4e1f2306d5d91025a0683347e
treeb7a76062aa4ef79f679e6a510a19e311ea2cc8a1
parent8bfe131e2fec4af2f463f2e1915c49b5f38a5a4d
parent6ca7cab746ef94cdf98b40ce788e2a8b1a90d59b
Reconcile with ics-mr0-release

Change-Id: I7388dfaa2145b726609e8b30dea22740cd1b1d7b