OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 Oct 2011 14:31:54 +0000 (07:31 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Tue, 18 Oct 2011 14:31:55 +0000 (07:31 -0700)
Change-Id: I21e5472086056b5ae9162cb9a6060a0cf08e96fa


Trivial merge