OSDN Git Service

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


Trivial merge