| commit | 4bbc09c0e3b5220913f24320c3619547bc703e8f | [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 | bc367a5d181b3d6c09c9acfb932083ae0ab74ad7 | |
| parent | 9dddc98693469c93e6adcf7b7a82703f9c589291 [diff] | |
| parent | e9bef148d2f82bcb42d1a53731bd8c8de71cc083 [diff] |
resolved conflicts for merge of e7fbfb6b to gingerbread-plus-aosp Change-Id: Icef97302fb99e3dd346ec6ee04aa9e8eea7bff26