| commit | 816dd3d443108b473965f97123eef7300f53615f | [log] [tgz] |
|---|---|---|
| author | Gilles Debunne <debunne@google.com> | Mon Mar 14 12:57:01 2011 -0700 |
| committer | Gilles Debunne <debunne@google.com> | Mon Mar 14 12:57:01 2011 -0700 |
| tree | f579f49872f12f8f1d5fb93186159e969046a64b | |
| parent | 206c62ed34dc8a48fd6c907d95456226949f42dd [diff] | |
| parent | 9c06c0ffc9fe24c7b8bbeca53bce76aca9d1ac4f [diff] |
resolved conflicts for merge of 9c06c0ff to gingerbread-plus-aosp Change-Id: I7f9c71eeb9fc5e01856f764930c6f168741cc9da