| commit | ce0d646cc0beb6b44d5429d01e51d00005264f44 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Fri Sep 30 05:56:51 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Fri Sep 30 05:56:51 2011 +0200 |
| tree | 0249a6a1c10ddf04e0a303b0d1b05b4a47633ca9 | |
| parent | 0acdbe0892105d01a38de9baf4e34eef22b8259c [diff] | |
| parent | 6cda7b6249c05ebcaebeb86badf957ec0f04e4ad [diff] |
resolved conflicts for merge of 6cda7b62 to gingerbread-plus-aosp Change-Id: I85bd5291c2a9cd29bff538b6d5a4dcd73f85a1fd