| commit | e20724c9c530e03bdeaf3f6ff31f2334ea7ffc72 | [log] [tgz] |
|---|---|---|
| author | David 'Digit' Turner <digit@google.com> | Tue Jul 12 01:23:22 2011 +0200 |
| committer | David 'Digit' Turner <digit@google.com> | Tue Jul 12 01:23:22 2011 +0200 |
| tree | e496042a851d09b187e2a1ed754e60fc16340c39 | |
| parent | 8bc4f69c082b6202f4ad25df0819dd2c61b84292 [diff] | |
| parent | 3154443d23340db7663d1483ac3dccabadf35257 [diff] |
resolved conflicts for merge of 3154443d to gingerbread-plus-aosp Change-Id: I9f547b2e5ea97a503abd7a6a18811af309913345