OSDN Git Service

Reconcile with ics-factoryrom-2-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Oct 2011 16:43:52 +0000 (09:43 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 28 Oct 2011 16:43:52 +0000 (09:43 -0700)
Change-Id: Ieddd7ec26db003b46bfc01db728a5795cbff61ab


Trivial merge