OSDN Git Service

resolved conflicts for merge of 6cda7b62 to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Fri, 30 Sep 2011 03:56:51 +0000 (05:56 +0200)
committerDavid 'Digit' Turner <digit@google.com>
Fri, 30 Sep 2011 03:56:51 +0000 (05:56 +0200)
Change-Id: I85bd5291c2a9cd29bff538b6d5a4dcd73f85a1fd


Trivial merge