OSDN Git Service

Merge from ics-mr0
authorThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Nov 2011 02:26:35 +0000 (18:26 -0800)
committerThe Android Open Source Project <initial-contribution@android.com>
Fri, 11 Nov 2011 02:26:45 +0000 (18:26 -0800)
Change-Id: I759452c031b9e2f02905dd488b61f100e3eaa87a


Trivial merge