OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Oct 2011 14:04:45 +0000 (07:04 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 13 Oct 2011 14:04:45 +0000 (07:04 -0700)
Change-Id: I58ba7ea1f3e87dcc5fc13ce213a221a311dc4eff


Trivial merge