diff options
author | The Android Open Source Project <initial-contribution@android.com> | 2010-04-08 16:22:42 -0700 |
---|---|---|
committer | The Android Open Source Project <initial-contribution@android.com> | 2010-04-08 16:22:49 -0700 |
commit | 555d73444f8f053323828e354f446ccee41439d5 (patch) | |
tree | ea54340c9d1b70bed85beae1d820a98090f23a0d /CHANGES.TXT | |
parent | 94f3a6dcf04b8b66781eb116f45a9bbbe5e245fa (diff) | |
parent | fbcab322c2a12bfe49d0faaef91fccdc7bb97d4e (diff) | |
download | external_qemu-555d73444f8f053323828e354f446ccee41439d5.zip external_qemu-555d73444f8f053323828e354f446ccee41439d5.tar.gz external_qemu-555d73444f8f053323828e354f446ccee41439d5.tar.bz2 |
merge from tools-r6
Change-Id: I8b1287b619b6ec77024cb1ce56fabc80d2b1146d
Diffstat (limited to 'CHANGES.TXT')
-rw-r--r-- | CHANGES.TXT | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/CHANGES.TXT b/CHANGES.TXT index c759716..7c9785b 100644 --- a/CHANGES.TXT +++ b/CHANGES.TXT @@ -17,7 +17,13 @@ Versions: 1.11 => SDK 1.6_r1 1.12 => SDK 2.0 1.13 => SDK 2.0.1 (but wrongly tagged 1.12) - 5.0 => current + + Starting from here, the emulator version number will match + the corresponding SDK Tools release level, i.e.: + + 5.0 => SDK Tools release 5 + 6.0 => SDK Tools release 6 + etc... ============================================================================== Changes between 6.0 and 5.0 @@ -28,6 +34,9 @@ IMPORTANT CHANGES: order to detect buffer under/overflows. This requires a new version of the C library that is only available in Froyo and above. +- Fix '-http-proxy' on Win32. This was actually a regression introduced + with the Donut SDK. + OTHER: - Add a '--static' option to both android-configure.sh and android-rebuild.sh |