OSDN Git Service

resolved conflicts for merge of 09636e17 to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 18:20:12 +0000 (20:20 +0200)
committerDavid 'Digit' Turner <digit@google.com>
Mon, 11 Jul 2011 18:48:41 +0000 (20:48 +0200)
Change-Id: If2b21def45b5de222e560af442a0ff9f56da5a35


Trivial merge