| commit | 2190147cd870545879fd7d87fa8baf2147171370 | [log] [tgz] |
|---|---|---|
| author | Jesse Wilson <jessewilson@google.com> | Thu Jan 13 10:38:10 2011 -0800 |
| committer | Jesse Wilson <jessewilson@google.com> | Thu Jan 13 10:38:10 2011 -0800 |
| tree | d306eeab72267a74b449277f61ac4eedc9b56552 | |
| parent | 6d3ada10746bf4718b84963934630eb3506d8d7a [diff] | |
| parent | d6cb085299ff68ba53d537705f84a497a8b8d28a [diff] |
resolved conflicts for merge of d6cb0852 to dalvik-dev Change-Id: Icaa0510c3ff7be336cf93c1c31604ef379b921ae