OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 30 Sep 2011 20:24:17 +0000 (13:24 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 30 Sep 2011 20:24:17 +0000 (13:24 -0700)
Change-Id: I859743c56d3721278fed7e22b7d41d0592b00118


Trivial merge