| commit | de80fa0a1c9217cdf6c92a1b2c1051c6dccc384b | [log] [tgz] |
|---|---|---|
| author | Scott Main <smain@google.com> | Fri Feb 18 19:42:29 2011 -0800 |
| committer | Scott Main <smain@google.com> | Fri Feb 18 19:42:29 2011 -0800 |
| tree | 2de34eaf949bd30904e7e7343a64fce86fec4561 | |
| parent | 286971d8653ca11caec47ac19b1170f27d5c8482 [diff] | |
| parent | b5e284f670b68a1e297270c306291157925ec7af [diff] |
resolved conflicts for merge of b842629c to honeycomb-plus-aosp Change-Id: I5628f9e3baad68882b63a2917df3fb0bb1bbdfa6