OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:07:59 +0000 (08:07 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 16 Dec 2011 16:07:59 +0000 (08:07 -0800)
Change-Id: I4efd2763f8ae4da60277edc110ff8649869a35e7


Trivial merge