| commit | 6a95adec3a5fa107f2bec11d77a66408f239c5ac | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sat Jul 25 20:35:55 2009 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sat Jul 25 20:35:55 2009 -0700 |
| tree | 703c0faa87326e344881fc8bdce11358195c09d6 | |
| parent | 063cc3ec35c3e8b1860645b15b5b643ce713c7fc [diff] | |
| parent | ec537042338c000af4526099599e128be63bee68 [diff] |
Merge korg/donut into korg/master Conflicts: libcore/luni/src/main/java/org/apache/harmony/luni/platform/PlatformAddressFactory.java vm/oo/Class.c