OSDN Git Service

resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp
authorDavid 'Digit' Turner <digit@google.com>
Fri, 23 Sep 2011 18:13:07 +0000 (20:13 +0200)
committerDavid 'Digit' Turner <digit@google.com>
Fri, 23 Sep 2011 18:13:07 +0000 (20:13 +0200)
Change-Id: I8720ca884f326b661e30b51c4cf1cfe31c1ac579


Trivial merge