Merge branch 'stable-2.11' into stable-2.12 * stable-2.11: Change copyright to AOSP Build with API version 2.11.7 Change-Id: Iba3eea3738b1369f5659c9632b240b207015e214
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java index 4c92dd2..3ba78bb 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventHandler.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventModule.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventModule.java index 232a1fc..7619a82 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventModule.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventModule.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java index 84de1bd..c51ac02 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventPool.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventQueue.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventQueue.java index cdb3fb9..07d5b41 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventQueue.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventQueue.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventStore.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventStore.java index 55e7e28..a7785db 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventStore.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventStore.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java index c60f4cc..22287e6 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfig.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogException.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogException.java index 8aa0a35..2137a95 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogException.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsLogException.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java index 41e90e2..121e2d8 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServlet.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/HttpModule.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/HttpModule.java index 32aa9ff..a75eb73 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/HttpModule.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/HttpModule.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/MalformedQueryException.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/MalformedQueryException.java index 7b37be7..56c0c73 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/MalformedQueryException.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/MalformedQueryException.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/QueryMaker.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/QueryMaker.java index 0e0b6c7..0fdf74c 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/QueryMaker.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/QueryMaker.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/ServiceUnavailableException.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/ServiceUnavailableException.java index 5e93ea0..57656e3 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/ServiceUnavailableException.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/ServiceUnavailableException.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsDb.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsDb.java index 319871c..cf6d2d9 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsDb.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/EventsDb.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/LocalEventsDb.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/LocalEventsDb.java index d3509f6..0590d6e 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/LocalEventsDb.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/LocalEventsDb.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java index 3f31a22..6286f50 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLClient.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntry.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntry.java index 75542d2..1ae9228 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntry.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntry.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java index e8f0559..32572e3 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLModule.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java index 1d7eb04..93c6569 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLQueryMaker.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java index 5f24627..0699160 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStore.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLTable.java b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLTable.java index 114f654..8102b1b 100644 --- a/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLTable.java +++ b/src/main/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLTable.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java index 8a1dbaa..67ff28b 100644 --- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java +++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventHandlerTest.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfigTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfigTest.java index d6ae725..9388319 100644 --- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfigTest.java +++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsLogConfigTest.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServletTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServletTest.java index 3af1bfa..2e51106 100644 --- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServletTest.java +++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/EventsRestApiServletTest.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/QueryMakerTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/QueryMakerTest.java index 9d606df..bad6ccf 100644 --- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/QueryMakerTest.java +++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/QueryMakerTest.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java index 09e7d07..eee066b 100644 --- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java +++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLEntryTest.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2015 Ericsson +// Copyright (C) 2015 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.
diff --git a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java index dcfec06..ebc18e4 100644 --- a/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java +++ b/src/test/java/com/ericsson/gerrit/plugins/eventslog/sql/SQLStoreTest.java
@@ -1,4 +1,4 @@ -// Copyright (C) 2014 Ericsson +// Copyright (C) 2014 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.