OSDN Git Service

Merge from ics-mr1
authorThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 15:47:34 +0000 (07:47 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 12 Dec 2011 15:47:43 +0000 (07:47 -0800)
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953


Trivial merge