| commit | e04c14962f4a1089d411e1f7fa4d1019fe723885 | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Tue Feb 08 16:33:58 2011 -0800 |
| committer | Gilles Debunne <debunne@google.com> | Tue Feb 08 16:33:58 2011 -0800 |
| tree | 2f240b612dc80d6e63e92661aaa52d6381c75c75 | |
| parent | a62bf8bb6b7a547802fb384b497e955940befa9c [diff] | |
| parent | c0728cc042bd5cc6ab520d3395deec50481f8f5a [diff] |
resolved conflicts for merge of c0728cc0 to gingerbread-plus-aosp Change-Id: I1b941e0610e498365d441c7bd23af276d1b5f986