OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 30 Sep 2011 21:31:56 +0000 (14:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 30 Sep 2011 21:31:56 +0000 (14:31 -0700)
Change-Id: I07c391b65a870c4d557a51cc4ed00a5f9474cfed


Trivial merge