OSDN Git Service

resolved conflicts for merge of d0d351b2 to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 21:20:22 +0000 (23:20 +0200)
committerDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 21:43:07 +0000 (23:43 +0200)
Change-Id: I1594c21fb3dd761b1e2275be2019ec139cf64174


Trivial merge