| commit | 1dd3301c8c6a770f07dfbacbcc00b4146033de33 | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Fri Jan 28 20:41:42 2011 -0600 |
| committer | Jeff Hamilton <jham@android.com> | Fri Jan 28 20:41:42 2011 -0600 |
| tree | b60da6c8c40f73796fb700626b8917375c7b4041 | |
| parent | 58ac4b4923604989076f585d8c2c997e54bdd274 [diff] | |
| parent | 86d7998cf75756c20b44ba813c83adb73a447669 [diff] |
resolved conflicts for merge of dc54a8c7 to honeycomb-merge Change-Id: Ie23b05102fc69de31537822ded3f77d398e486f8