OSDN Git Service

resolved conflicts for merge of 3154443d to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 23:23:22 +0000 (01:23 +0200)
committerDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 23:23:22 +0000 (01:23 +0200)
Change-Id: I9f547b2e5ea97a503abd7a6a18811af309913345


Trivial merge