OSDN Git Service

Reconcile with ics-mr0-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:49:39 +0000 (15:49 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 18 Nov 2011 23:49:39 +0000 (15:49 -0800)
Change-Id: I61ef83c288814c62369fabdcf50d867708f05f51


Trivial merge