| commit | 28fc4830fdc68db134783955cc9f54f32d35b0fd | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Wed Apr 13 10:53:33 2011 -0700 |
| committer | Android Code Review <code-review@android.com> | Wed Apr 13 10:53:33 2011 -0700 |
| tree | 7fe893645033839ea401f34c6e01ad3fd8ed0ef5 | |
| parent | 21f54bf13529077971e89b21f1af88d3b7532b84 [diff] | |
| parent | 903283289f76c53ea457d8b993b3f35dfac385db [diff] |
Merge "Cleanup leftover merge conflict"