OSDN Git Service

Reconcile with ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 1 Nov 2011 17:08:00 +0000 (10:08 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 1 Nov 2011 17:08:00 +0000 (10:08 -0700)
Change-Id: I5488896eaf252e88fd0a7c8052c1e27be3f91e6f


Trivial merge