OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 15:59:17 +0000 (07:59 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 15:59:17 +0000 (07:59 -0800)
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3


Trivial merge