OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 15:23:03 +0000 (08:23 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 21 Mar 2012 15:23:03 +0000 (08:23 -0700)
Change-Id: I10d78e60e39606f85cfa6fc7e9a7da14db0eeb0a


Trivial merge