OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 12 Jan 2012 16:56:04 +0000 (08:56 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 12 Jan 2012 16:56:04 +0000 (08:56 -0800)
Change-Id: I8aa81509837cca423f8ac241d97e45d822086acf


Trivial merge