| commit | c8d718012b0ac4abf668a9f494c33d2dd8a314e5 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Mon Jul 11 23:20:22 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Mon Jul 11 23:43:07 2011 +0200 |
| tree | 2a2dc608da233d4ae150ded771520ab4c66d7aaa | |
| parent | 03c60a44861951126affa75ba8ee4233c136fe92 [diff] | |
| parent | d0d351b2ef726ff1b76a3efb4aad91e4d1436f6a [diff] |
resolved conflicts for merge of d0d351b2 to gingerbread-plus-aosp Change-Id: I1594c21fb3dd761b1e2275be2019ec139cf64174