OSDN Git Service

Reconcile with ics-mr1-release
authorThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 03:10:19 +0000 (19:10 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Wed, 14 Dec 2011 03:10:19 +0000 (19:10 -0800)
Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8


Trivial merge