| commit | c806fe156007cc8b656512c85d9fa6520cc4793d | [log] [tgz] |
|---|---|---|
| author | Xavier Ducrohet <xav@android.com> | Thu Feb 24 16:15:11 2011 -0800 |
| committer | Xavier Ducrohet <xav@android.com> | Thu Feb 24 16:15:11 2011 -0800 |
| tree | d765c7edd77f07a9882ddd5b8176fd04fecce4dd | |
| parent | 492301161bdc47a826ce9910dfd81d833671b374 [diff] | |
| parent | e90a80a73dfa43797d8af678aae6152b0219b62c [diff] |
resolved conflicts for merge of a4350fc0 to gingerbread-plus-aosp Change-Id: I065af5d555fa2197847ad47c84003dcd11fe26c7