OSDN Git Service

Reconcile with ics-factoryrom-release
authorThe Android Open Source Project <initial-contribution@android.com>
Sat, 8 Oct 2011 02:06:12 +0000 (19:06 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Sat, 8 Oct 2011 02:06:12 +0000 (19:06 -0700)
Change-Id: I5b9b2250b49befd6afd87ed426c4883e006bf292


Trivial merge