OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 19 Sep 2011 15:00:42 +0000 (08:00 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 19 Sep 2011 15:00:42 +0000 (08:00 -0700)
Change-Id: Ic1b2b256832ba7fc797180de3c0b29380f6355d9


Trivial merge