OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:08:07 +0000 (08:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:08:07 +0000 (08:08 -0800)
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da


Trivial merge