OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Oct 2011 23:15:57 +0000 (16:15 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 5 Oct 2011 23:15:57 +0000 (16:15 -0700)
Change-Id: Ic9d7efb8cb6228820010bb55973cef63b93b8e65


Trivial merge