OSDN Git Service

Reconcile with ics-factoryrom-release ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 17 Oct 2011 19:19:56 +0000 (12:19 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 17 Oct 2011 19:19:56 +0000 (12:19 -0700)
Change-Id: I924918872b02de185bee53d0516fc34b9d3b3f28


Trivial merge