OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:06:50 +0000 (13:06 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Thu, 19 Jan 2012 21:06:50 +0000 (13:06 -0800)
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b


Trivial merge