Big merge from experimental to bleeding edge.

utils/pub/lock_file.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 library lock_file;
 
-import 'dart:json';
+import 'dart:json' as json;
 import 'package.dart';
 import 'source_registry.dart';
 import 'utils.dart';
 import 'version.dart';
 import 'yaml/yaml.dart';
 
 /// A parsed and validated `pubspec.lock` file.
 class LockFile {
   /// The packages this lockfile pins.
   Map<String, PackageId> packages;
@@ skipping 60 matching lines @@
     packages.forEach((name, id) {
       packagesObj[name] = {
         'version': id.version.toString(),
         'source': id.source.name,
         'description': id.description
       };
     });
 
     // TODO(nweiz): Serialize using the YAML library once it supports
     // serialization. For now, we use JSON, since it's a subset of YAML anyway.
-    return JSON.stringify({'packages': packagesObj});
+    return json.stringify({'packages': packagesObj});
   }
 }