| commit | 1972851d2016e74cc9575adb1748c862ba5d2e84 | [log] [tgz] |
|---|---|---|
| author | Jean-Baptiste Queru <jbq@google.com> | Sat Jul 25 17:25:52 2009 -0700 |
| committer | Jean-Baptiste Queru <jbq@google.com> | Sat Jul 25 17:25:52 2009 -0700 |
| tree | 4fbf5b366616dc19367a80410713b2367ed52598 | |
| parent | 8bbfa508be9430ef8a964af02942ac854a0f9cbb [diff] | |
| parent | 7e236a05ac0148532e5a0670c55b76322b226dd3 [diff] |
Merge korg/donut into korg/master Conflicts: tools/eclipse/plugins/README.txt tools/sdkmanager/libs/sdklib/src/com/android/sdklib/avd/AvdManager.java