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)
Change-Id: I7388dfaa2145b726609e8b30dea22740cd1b1d7b


Trivial merge