OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Sep 2011 17:11:00 +0000 (10:11 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 27 Sep 2011 17:11:00 +0000 (10:11 -0700)
Change-Id: Ic6421d14d0c9fac864e6fe67ae6cd763d50cab9a


Trivial merge