OSDN Git Service

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


Trivial merge