| commit | 2cfb2ad66741e923bcd99719bb6b8f4e1189dd4d | [log] [tgz] |
|---|---|---|
| author | Brian Carlstrom <bdc@google.com> | Fri Nov 19 10:44:43 2010 -0800 |
| committer | Brian Carlstrom <bdc@google.com> | Fri Nov 19 10:44:43 2010 -0800 |
| tree | 06df4fd4a09d9b592d8b31a6f6a793c4ae75baa4 | |
| parent | 0ddb3857c085d4fdaaa4515cc0c357a5f7d19b19 [diff] | |
| parent | 18fb450a3043d52ff6c134ff901987f4d3a9af96 [diff] |
resolved conflicts for merge of 18fb450a to dalvik-dev Change-Id: I5f7884af56908adbdb9b9ab5799b5b7d0f7f51cc