Merge
authoramurillo
Wed, 05 Oct 2016 09:52:53 -0700
changeset 41345 d65794815f60
parent 41344 11390434331a (current diff)
parent 41278 2ec30ba8bee4 (diff)
child 41346 00e1ee42ec25
Merge
--- a/hotspot/make/BuildHotspot.gmk	Wed Oct 05 06:28:22 2016 -0700
+++ b/hotspot/make/BuildHotspot.gmk	Wed Oct 05 09:52:53 2016 -0700
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it