OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Dec 2011 21:08:24 +0000 (13:08 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 20 Dec 2011 21:08:24 +0000 (13:08 -0800)
Change-Id: I3624715f06ac682520676b2e6d45a29e1d20b1d9


Trivial merge