| commit | cc633e4965f46752ce865ed46f0c34b6cf57f3c9 | [log] [tgz] |
|---|---|---|
| author | Jeff Brown <jeffbrown@google.com> | Thu Sep 30 16:39:16 2010 -0700 |
| committer | Jeff Brown <jeffbrown@google.com> | Thu Sep 30 16:39:16 2010 -0700 |
| tree | 408bdec54f939cf5125cac410594f0271e6625c7 | |
| parent | 77fdd16cf3c662898af72778462dced701289f9f [diff] | |
| parent | 4110368b935e51ebd75fff88492bbef451837383 [diff] |
resolved conflicts for merge of 4110368b to gingerbread-plus-aosp Change-Id: I23f83b1272ba6aef5a4fbadf5e450c1e0b4dd82b