commit 78b27778be47f538724bfe70904bfaffcd36947f
author Hugo Arès <hugo.ares@ericsson.com> Mon Jun 11 13:28:15 2018 -0400
committer Hugo Arès <hugo.ares@ericsson.com> Mon Jun 11 13:29:03 2018 -0400
tree ac37bb068460424ba74cdde1b597a6d03feb3171
parent 42cc13614022b13d96950e4d4d4766969e527108
parent 12a645d708c865594a9a606ff6b15f66d79a5fee

Merge branch 'stable-2.13' into stable-2.14

* stable-2.13:
  Change copyright to AOSP

Change-Id: Idb74d73ba469885dc3c90d1e21fc04f75ee83910

src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java b/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
index 871740e..6b9e2c0 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/goimport/GoImportFilter.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Ericsson
+// Copyright (C) 2017 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

src/main/java/com/ericsson/gerrit/plugins/goimport/HttpModule.java

diff --git a/src/main/java/com/ericsson/gerrit/plugins/goimport/HttpModule.java b/src/main/java/com/ericsson/gerrit/plugins/goimport/HttpModule.java
index 789d795..fe5114e 100644
--- a/src/main/java/com/ericsson/gerrit/plugins/goimport/HttpModule.java
+++ b/src/main/java/com/ericsson/gerrit/plugins/goimport/HttpModule.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Ericsson
+// Copyright (C) 2017 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java b/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java
index 532997c..b2a015c 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/goimport/GoImportFilterTest.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Ericsson
+// Copyright (C) 2017 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

src/test/java/com/ericsson/gerrit/plugins/goimport/HttpModuleTest.java

diff --git a/src/test/java/com/ericsson/gerrit/plugins/goimport/HttpModuleTest.java b/src/test/java/com/ericsson/gerrit/plugins/goimport/HttpModuleTest.java
index adec853..a73da44 100644
--- a/src/test/java/com/ericsson/gerrit/plugins/goimport/HttpModuleTest.java
+++ b/src/test/java/com/ericsson/gerrit/plugins/goimport/HttpModuleTest.java
@@ -1,4 +1,4 @@
-// Copyright (C) 2017 Ericsson
+// Copyright (C) 2017 The Android Open Source Project
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.

tools/sonar/sonar.sh

diff --git a/tools/sonar/sonar.sh b/tools/sonar/sonar.sh
index 0d86083..8df06d3 100644
--- a/tools/sonar/sonar.sh
+++ b/tools/sonar/sonar.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (C) 2018 Ericsson
+# Copyright (C) 2018 The Android Open Source Project
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.