| commit | dac3063adb10f547d4392fe5bf08a10d3b08486d | [log] [tgz] |
|---|---|---|
| author | Jeff Hamilton <jham@android.com> | Thu Jan 27 23:39:31 2011 -0600 |
| committer | Ed Heyl <ed@google.com> | Fri Jan 28 13:16:46 2011 -0800 |
| tree | 669a50fac581c2f93f95ccfd28ff8b31820d23e9 | |
| parent | d1fda43ed7343b4775a65e80629d85b7e99b14eb [diff] |
resolved conflicts for merge of a314f32b to honeycomb-merge Change-Id: I98d37ee8666d9d3f195d2b23d50dc851f1ef6500