commit 3e043b413bacd3bd9a2d391b0a03977820c6581d
author Steven Laver <lavers@google.com> Mon Jan 06 13:24:38 2020 -0800
committer Steven Laver <lavers@google.com> Mon Jan 06 13:24:38 2020 -0800
tree 183f0a8cd1c2f1c10d1fa51fa557be6443991e30
parent 889e4c8c0120da800d35d378eb834da40cdbf9f1
parent a4f047bac33aefbbfd58d5d6f019c8766263ade0

Merge RP1A.200106.001

Change-Id: I6b870cf9e964eee79b3027125b3bd9c0aa4849be

Android.bp

diff --git a/Android.bp b/Android.bp
index 2f68261..531562b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -207,3 +207,13 @@
     deps: ["golang-protobuf-proto"],
     srcs: ["ptypes/wrappers/wrappers.pb.go"],
 }
+
+bootstrap_go_package {
+    name: "golang-protobuf-jsonpb",
+    pkgPath: "github.com/golang/protobuf/jsonpb",
+    srcs: ["jsonpb/jsonpb.go"],
+    deps: [
+        "golang-protobuf-proto",
+        "golang-protobuf-ptypes-struct",
+    ],
+}

go.mod

diff --git a/go.mod b/go.mod
index eccf7fd..de28f6f 100644
--- a/go.mod
+++ b/go.mod
@@ -1 +1,3 @@
 module github.com/golang/protobuf
+
+go 1.12