Big merge from experimental to bleeding edge.

tools/html_json_doc/lib/json_to_html.dart

Index: tools/html_json_doc/lib/json_to_html.dart
diff --git a/tools/html_json_doc/lib/json_to_html.dart b/tools/html_json_doc/lib/json_to_html.dart
index d25aa4d0b7e654254ef8e7cafbaa575ef98746be..391cd3c1d6d04be7e55d4c64c58f4850d68895ad 100644
--- a/tools/html_json_doc/lib/json_to_html.dart
+++ b/tools/html_json_doc/lib/json_to_html.dart
@@ -7,7 +7,7 @@
  * the HTML files the comments are associated with.
  *
  * The format of the JSON file is:
- * 
+ *
  *     {
  *       "$filename":
  *         {
@@ -22,9 +22,9 @@
  */
 library json_to_html;
 
-import 'dart:json';
+import 'dart:json' as JSON;
 import 'dart:io';
-
+import 'dart:async';
 
 /// True if any errors were triggered through the conversion.
 bool _anyErrors = false;
@@ -139,7 +139,7 @@ void _convertFile(File file, Map<String, List<String>> comments) {
         '${new Path(file.fullPathSync()).filename}:\n"$key"');
     _anyErrors = true;
   });
-  
+
   // TODO(amouravski): file.writeAsStringSync('${Strings.join(fileLines, '\n')}\n');
   var outputStream = file.openOutputStream();
   outputStream.writeString(Strings.join(fileLines, '\n'));