From 0d6e3e2b1510319f218d8b6f1590f25079d4fc4a Mon Sep 17 00:00:00 2001
From: David 'Digit' Turner <digit@google.com>
Date: Wed, 31 Mar 2010 16:53:59 -0700
Subject: Fix emulator changelog

Change-Id: I77ddd628c7fea0b128623cecd336842673f07940
---
 CHANGES.TXT | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'CHANGES.TXT')

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
-- 
cgit v1.1