| commit | 163b9ff7d1014898fd346db9c9378ede4f375f19 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Tue Jul 12 00:57:09 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Tue Jul 12 00:57:09 2011 +0200 |
| tree | 06b367c572519fb0164fba63fc918d1422a16419 | |
| parent | dc56d3cadd81630b21b2eb32724b495c81bffb0e [diff] | |
| parent | ce4141f7041f58e46e40302feaa93a6c26d92141 [diff] |
resolved conflicts for merge of 7816eded to gingerbread-plus-aosp Change-Id: I1f7d1f488f6a86774962d427aca472a8a444e0aa