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)
commitce0d646cc0beb6b44d5429d01e51d00005264f44
tree0249a6a1c10ddf04e0a303b0d1b05b4a47633ca9
parent0acdbe0892105d01a38de9baf4e34eef22b8259c
parent6cda7b6249c05ebcaebeb86badf957ec0f04e4ad
resolved conflicts for merge of 6cda7b62 to gingerbread-plus-aosp

Change-Id: I85bd5291c2a9cd29bff538b6d5a4dcd73f85a1fd