| commit | 7db617efc079ccc1f384ef7939f7e8c444dfff7a | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Fri Apr 29 13:31:31 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Fri Apr 29 13:31:31 2011 +0200 |
| tree | 4c26502301f1318ce26c186faf4857143b76e094 | |
| parent | b0d0e260bd6118959fa0e2d3c84037b3e0178551 [diff] | |
| parent | b013bfc17110787f4a735552f7e0c03261a3f2b5 [diff] |
resolved conflicts for merge of b013bfc1 to honeycomb-plus-aosp Change-Id: I159dd58c403bc38f9637163d8cd5e6270e4f201c