OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Dec 2011 13:11:43 +0000 (05:11 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 13 Dec 2011 13:11:43 +0000 (05:11 -0800)
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8


Trivial merge