OSDN Git Service

Reconcile with ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 Nov 2011 16:55:42 +0000 (08:55 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 16 Nov 2011 16:55:43 +0000 (08:55 -0800)
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e


Trivial merge