| commit | 960737e761895d5850beabab809d03b3621d0ec3 | [log] [tgz] |
|---|---|---|
| author | repo sync <andih@google.com> | Tue Jan 11 15:26:51 2011 -0800 |
| committer | repo sync <andih@google.com> | Tue Jan 11 15:26:51 2011 -0800 |
| tree | f3296d85930b340675dc2c41bcb80ac29af16e03 | |
| parent | 7b8a803497450bb90b9c4f5ba3426bf984fad274 [diff] | |
| parent | 0d85990f20106513b6da5a446702aa62ab61397f [diff] |
resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26