OSDN Git Service

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


Trivial merge