OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Dec 2011 16:53:06 +0000 (08:53 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 5 Dec 2011 16:53:06 +0000 (08:53 -0800)
Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c


Trivial merge