| commit | 3c935eda2dcd96eda70da6367d705b3b081f6524 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Fri Sep 23 20:13:07 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Fri Sep 23 20:13:07 2011 +0200 |
| tree | d13f24e277534af7e2842e543d8ad4b5350046f3 | |
| parent | bce402a8fadf27b07b164b0468e27bb9b6de79e6 [diff] | |
| parent | 33fddf0ca9801080472116654264be63a21b6e80 [diff] |
resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp Change-Id: I8720ca884f326b661e30b51c4cf1cfe31c1ac579