| commit | c67a10e6a443042414ddb3322de51b8ccdba8b21 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Tue Jul 12 00:27:28 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Tue Jul 12 00:33:11 2011 +0200 |
| tree | a91e49d509cc71a165bc8f6c9a27af9c3416b7ba | |
| parent | 534b7341a1d4b2972d373e5d5f10452b245a6c50 [diff] | |
| parent | aaea6ca1dc413af304d93da866cad9e6f4e6c299 [diff] |
resolved conflicts for merge of aaea6ca1 to gingerbread-plus-aosp Change-Id: I2c0d5cbed821bb4f5c89339e440dba92a6f2aa2c