OSDN Git Service

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


Trivial merge