| commit | 5b0f030d0bfdf7003e74b24da8c4379c74447380 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 23 14:14:07 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Fri Jul 23 14:15:01 2010 -0700 |
| tree | 1cbd8043e2aa2e4d2a7663fc0de166fd2f37d3aa | |
| parent | 08f2b10c4b2e7fc1c666cc1d896e227289206b24 [diff] | |
| parent | a9b1e01afaeae548c408bf42c7b7eb280d265208 [diff] |
resolved conflicts for merge of a9b1e01a to gingerbread-plus-aosp Change-Id: Ief79eaa532b583d9608701d48464b7afdc493bac