api: update go1.5.txt

Fixes #11935

Change-Id: Ife00c246345f7d3f96aa95349a35e76671ca7160
Reviewed-on: https://go-review.googlesource.com/12769
Reviewed-by: Dave Cheney <dave@cheney.net>
Reviewed-by: Russ Cox <rsc@golang.org>

diff --git a/api/go1.5.txt b/api/go1.5.txt
index 72e4ad9ae75d41108d3613d8951f10a8b29329e0..d9cf7970755a40b4564423bd048dd0a06aff9739 100644 (file)
--- a/api/go1.5.txt
+++ b/api/go1.5.txt
@@ -278,6 +278,11 @@ pkg encoding/base64, const StdPadding int32
 pkg encoding/base64, method (Encoding) WithPadding(int32) *Encoding
 pkg encoding/base64, var RawStdEncoding *Encoding
 pkg encoding/base64, var RawURLEncoding *Encoding
+pkg encoding/json, method (*Decoder) More() bool
+pkg encoding/json, method (*Decoder) Token() (Token, error)
+pkg encoding/json, method (Delim) String() string
+pkg encoding/json, type Delim int32
+pkg encoding/json, type Token interface {}
 pkg encoding/json, type UnmarshalTypeError struct, Offset int64
 pkg flag, func UnquoteUsage(*Flag) (string, string)
 pkg go/ast, type EmptyStmt struct, Implicit bool
@@ -874,6 +879,7 @@ pkg reflect, func FuncOf([]Type, []Type, bool) Type
 pkg runtime, func ReadTrace() []uint8
 pkg runtime, func StartTrace() error
 pkg runtime, func StopTrace()
+pkg runtime, type MemStats struct, GCCPUFraction float64
 pkg runtime/trace, func Start(io.Writer) error
 pkg runtime/trace, func Stop()
 pkg strings, func Compare(string, string) int