OSDN Git Service

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


Trivial merge