OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Oct 2011 11:29:21 +0000 (04:29 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 11 Oct 2011 11:29:21 +0000 (04:29 -0700)
Change-Id: I0a35a81c49649458f8c02b093a8638539c65049d


Trivial merge