Merge release-20200422.0-51-g1f4087e (automated)

1 files changed, 0 insertions, 13 deletions

diff --git a/pkg/tcpip/tcpip_state_autogen.go b/pkg/tcpip/tcpip_state_autogen.go
index 37b11704b..8ea900688 100755
--- a/pkg/tcpip/tcpip_state_autogen.go
+++ b/pkg/tcpip/tcpip_state_autogen.go
@@ -1,8 +1,5 @@
 // automatically generated by stateify.
 
-// +build go1.9
-// +build !go1.15
-
 package tcpip
 
 import (
@@ -68,18 +65,8 @@ func (x *IPPacketInfo) load(m state.Map) {
 	m.Load("DestinationAddr", &x.DestinationAddr)
 }
 
-func (x *StdClock) beforeSave() {}
-func (x *StdClock) save(m state.Map) {
-	x.beforeSave()
-}
-
-func (x *StdClock) afterLoad() {}
-func (x *StdClock) load(m state.Map) {
-}
-
 func init() {
 	state.Register("pkg/tcpip.FullAddress", (*FullAddress)(nil), state.Fns{Save: (*FullAddress).save, Load: (*FullAddress).load})
 	state.Register("pkg/tcpip.ControlMessages", (*ControlMessages)(nil), state.Fns{Save: (*ControlMessages).save, Load: (*ControlMessages).load})
 	state.Register("pkg/tcpip.IPPacketInfo", (*IPPacketInfo)(nil), state.Fns{Save: (*IPPacketInfo).save, Load: (*IPPacketInfo).load})
-	state.Register("pkg/tcpip.StdClock", (*StdClock)(nil), state.Fns{Save: (*StdClock).save, Load: (*StdClock).load})
 }