| commit | 24d6f4813b84240bb839b93f163a52a8447ff583 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 11 09:23:12 2010 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 11 09:23:12 2010 -0700 |
| tree | b9f691f99c0cfc15edfe6e5b955763727607734e | |
| parent | 8bdbbe2de23a8a8fc26b7f3a4b7dfdbe1112ac9f [diff] | |
| parent | 3031e475e1f9c7f7eacf131e37e6d4a3a929d3b4 [diff] |
resolved conflicts for merge of 3031e475 to gingerbread-plus-aosp Change-Id: I8098e7e75f84d36b7a56b8033ffbaa9a1333fcec