tree b197749387caffe3fa1c42a921cdf8039129984a
parent 979da91acc5f45d8968d4126f613d467755612a4
parent 87050d932769bb537d9546983c82ecce219cd7b2
author Colin Cross <ccross@android.com> 1567811210 -0700
committer Colin Cross <ccross@android.com> 1567811244 -0700

Merge remote-tracking branch 'aosp/upstream'

* aosp/upstream:
  Fix compiling binaries with go 1.13

Test: treehugger
Change-Id: Ib600e4a950ed5a0c163946a023f70a611eaad696