OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:02:06 +0000 (10:02 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 16 Feb 2012 18:02:06 +0000 (10:02 -0800)
Change-Id: I3cf7e38adf5847f0b3327c738cf38c0df9abcdea


Trivial merge