OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:24 +0000 (08:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 1 Feb 2012 16:49:24 +0000 (08:49 -0800)
Change-Id: I37e2eb5cd34a47e3eb7b2bf2353b50fc14972adf


Trivial merge