| commit | 994b68f5c7d637d2945c06260fe35b266c10379d | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Sun Aug 29 17:41:36 2010 -0700 |
| committer | David 'Digit' Turner <digit@google.com> | Sun Aug 29 17:41:36 2010 -0700 |
| tree | 6fa41d8b762ca971f2cc7bb11fe2396082245eee | |
| parent | 41e533af4a2720c1dc228ba40b6582ca53085c3a [diff] | |
| parent | 6a51defa034a1c033ed01f7de444c0a4fc615249 [diff] |
resolved conflicts for merge of 6a51defa to gingerbread-plus-aosp Change-Id: I0367bcffe9179904ca820e3b824dddfa47594f63