Update libjingle license statements at top of talk files for consistency

BUG=2133 R=juberti@webrtc.org Review URL: https://webrtc-codereview.appspot.com/39559004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@8105 4adac7df-926f-26a2-2b94-8c16560cd09d
2015-01-20 21:36:13 +00:00 · 2015-01-20 21:36:13 +00:00 · 5f93d0a140
commit 5f93d0a140
parent cbacd9e3bf
362 changed files with 1501 additions and 1221 deletions
--- a/talk/PRESUBMIT.py
+++ b/talk/PRESUBMIT.py
@ -32,7 +32,7 @@ def _LicenseHeader(input_api):
  years_re = '%s(--%s)?' % (years_re, years_re)
  license_header = (
      r'.*? libjingle\n'
-      r'.*? Copyright %(year)s,? Google Inc\.\n'
+      r'.*? Copyright %(year)s Google Inc\..*\n'
      r'.*?\n'
      r'.*? Redistribution and use in source and binary forms, with or without'
        r'\n'
--- a/talk/app/webrtc/androidtests/src/org/webrtc/PeerConnectionAndroidTest.java
+++ b/talk/app/webrtc/androidtests/src/org/webrtc/PeerConnectionAndroidTest.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/audiotrack.cc
+++ b/talk/app/webrtc/audiotrack.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2004--2011, Google Inc.
+ * Copyright 2004--2011 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@ -24,6 +24,7 @@
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+
 #include "talk/app/webrtc/audiotrack.h"

 #include <string>
--- a/talk/app/webrtc/audiotrack.h
+++ b/talk/app/webrtc/audiotrack.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2011, Google Inc.
+ * Copyright 2011 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/audiotrackrenderer.cc
+++ b/talk/app/webrtc/audiotrackrenderer.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/audiotrackrenderer.h
+++ b/talk/app/webrtc/audiotrackrenderer.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/datachannel.cc
+++ b/talk/app/webrtc/datachannel.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
@ -24,6 +24,7 @@
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
+
 #include "talk/app/webrtc/datachannel.h"

 #include <string>
--- a/talk/app/webrtc/datachannel.h
+++ b/talk/app/webrtc/datachannel.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/datachannel_unittest.cc
+++ b/talk/app/webrtc/datachannel_unittest.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/datachannelinterface.h
+++ b/talk/app/webrtc/datachannelinterface.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/dtmfsender.cc
+++ b/talk/app/webrtc/dtmfsender.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/dtmfsender.h
+++ b/talk/app/webrtc/dtmfsender.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/dtmfsender_unittest.cc
+++ b/talk/app/webrtc/dtmfsender_unittest.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/dtmfsenderinterface.h
+++ b/talk/app/webrtc/dtmfsenderinterface.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/fakeportallocatorfactory.h
+++ b/talk/app/webrtc/fakeportallocatorfactory.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2011, Google Inc.
+ * Copyright 2011 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
+++ b/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/jni/peerconnection_jni.cc
+++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/AudioSource.java
+++ b/talk/app/webrtc/java/src/org/webrtc/AudioSource.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/AudioTrack.java
+++ b/talk/app/webrtc/java/src/org/webrtc/AudioTrack.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/DataChannel.java
+++ b/talk/app/webrtc/java/src/org/webrtc/DataChannel.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/IceCandidate.java
+++ b/talk/app/webrtc/java/src/org/webrtc/IceCandidate.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/Logging.java
+++ b/talk/app/webrtc/java/src/org/webrtc/Logging.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/MediaConstraints.java
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaConstraints.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/MediaSource.java
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaSource.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/MediaStream.java
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaStream.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/MediaStreamTrack.java
+++ b/talk/app/webrtc/java/src/org/webrtc/MediaStreamTrack.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/PeerConnection.java
+++ b/talk/app/webrtc/java/src/org/webrtc/PeerConnection.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/PeerConnectionFactory.java
+++ b/talk/app/webrtc/java/src/org/webrtc/PeerConnectionFactory.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/SdpObserver.java
+++ b/talk/app/webrtc/java/src/org/webrtc/SdpObserver.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/SessionDescription.java
+++ b/talk/app/webrtc/java/src/org/webrtc/SessionDescription.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/StatsObserver.java
+++ b/talk/app/webrtc/java/src/org/webrtc/StatsObserver.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/StatsReport.java
+++ b/talk/app/webrtc/java/src/org/webrtc/StatsReport.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/VideoCapturer.java
+++ b/talk/app/webrtc/java/src/org/webrtc/VideoCapturer.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/VideoRenderer.java
+++ b/talk/app/webrtc/java/src/org/webrtc/VideoRenderer.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/VideoSource.java
+++ b/talk/app/webrtc/java/src/org/webrtc/VideoSource.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/src/org/webrtc/VideoTrack.java
+++ b/talk/app/webrtc/java/src/org/webrtc/VideoTrack.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java
+++ b/talk/app/webrtc/java/testcommon/src/org/webrtc/PeerConnectionTest.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh
+++ b/talk/app/webrtc/javatests/libjingle_peerconnection_java_unittest.sh
@ -1,7 +1,7 @@
 #!/bin/bash
 #
 # libjingle
-# Copyright 2013, Google Inc.
+# Copyright 2013 Google Inc.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTestJava.java
+++ b/talk/app/webrtc/javatests/src/org/webrtc/PeerConnectionTestJava.java
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/jsep.h
+++ b/talk/app/webrtc/jsep.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/jsepicecandidate.cc
+++ b/talk/app/webrtc/jsepicecandidate.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/jsepicecandidate.h
+++ b/talk/app/webrtc/jsepicecandidate.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/jsepsessiondescription.cc
+++ b/talk/app/webrtc/jsepsessiondescription.cc
@ -1,5 +1,6 @@
-/* libjingle
- * Copyright 2012, Google Inc.
+/*
+ * libjingle
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/jsepsessiondescription.h
+++ b/talk/app/webrtc/jsepsessiondescription.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/jsepsessiondescription_unittest.cc
+++ b/talk/app/webrtc/jsepsessiondescription_unittest.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/localaudiosource.cc
+++ b/talk/app/webrtc/localaudiosource.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/localaudiosource.h
+++ b/talk/app/webrtc/localaudiosource.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/localaudiosource_unittest.cc
+++ b/talk/app/webrtc/localaudiosource_unittest.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediaconstraintsinterface.cc
+++ b/talk/app/webrtc/mediaconstraintsinterface.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediaconstraintsinterface.h
+++ b/talk/app/webrtc/mediaconstraintsinterface.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastream.cc
+++ b/talk/app/webrtc/mediastream.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2011, Google Inc.
+ * Copyright 2011 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastream.h
+++ b/talk/app/webrtc/mediastream.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2011, Google Inc.
+ * Copyright 2011 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastream_unittest.cc
+++ b/talk/app/webrtc/mediastream_unittest.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2011, Google Inc.
+ * Copyright 2011 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastreamhandler.cc
+++ b/talk/app/webrtc/mediastreamhandler.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastreamhandler.h
+++ b/talk/app/webrtc/mediastreamhandler.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastreamhandler_unittest.cc
+++ b/talk/app/webrtc/mediastreamhandler_unittest.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastreaminterface.h
+++ b/talk/app/webrtc/mediastreaminterface.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastreamprovider.h
+++ b/talk/app/webrtc/mediastreamprovider.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastreamproxy.h
+++ b/talk/app/webrtc/mediastreamproxy.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2011, Google Inc.
+ * Copyright 2011 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastreamsignaling.cc
+++ b/talk/app/webrtc/mediastreamsignaling.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastreamsignaling.h
+++ b/talk/app/webrtc/mediastreamsignaling.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastreamsignaling_unittest.cc
+++ b/talk/app/webrtc/mediastreamsignaling_unittest.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2012, Google Inc.
+ * Copyright 2012 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastreamtrack.h
+++ b/talk/app/webrtc/mediastreamtrack.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2011, Google Inc.
+ * Copyright 2011 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/mediastreamtrackproxy.h
+++ b/talk/app/webrtc/mediastreamtrackproxy.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2011, Google Inc.
+ * Copyright 2011 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/notifier.h
+++ b/talk/app/webrtc/notifier.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2011, Google Inc.
+ * Copyright 2011 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCAudioTrack+Internal.h
+++ b/talk/app/webrtc/objc/RTCAudioTrack+Internal.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCAudioTrack.mm
+++ b/talk/app/webrtc/objc/RTCAudioTrack.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCDataChannel+Internal.h
+++ b/talk/app/webrtc/objc/RTCDataChannel+Internal.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCDataChannel.mm
+++ b/talk/app/webrtc/objc/RTCDataChannel.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCEAGLVideoView.m
+++ b/talk/app/webrtc/objc/RTCEAGLVideoView.m
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCEnumConverter.h
+++ b/talk/app/webrtc/objc/RTCEnumConverter.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCEnumConverter.mm
+++ b/talk/app/webrtc/objc/RTCEnumConverter.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCI420Frame+Internal.h
+++ b/talk/app/webrtc/objc/RTCI420Frame+Internal.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCI420Frame.mm
+++ b/talk/app/webrtc/objc/RTCI420Frame.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCICECandidate+Internal.h
+++ b/talk/app/webrtc/objc/RTCICECandidate+Internal.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCICECandidate.mm
+++ b/talk/app/webrtc/objc/RTCICECandidate.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCICEServer+Internal.h
+++ b/talk/app/webrtc/objc/RTCICEServer+Internal.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCICEServer.mm
+++ b/talk/app/webrtc/objc/RTCICEServer.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCMediaConstraints+Internal.h
+++ b/talk/app/webrtc/objc/RTCMediaConstraints+Internal.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCMediaConstraints.mm
+++ b/talk/app/webrtc/objc/RTCMediaConstraints.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCMediaConstraintsNative.cc
+++ b/talk/app/webrtc/objc/RTCMediaConstraintsNative.cc
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCMediaConstraintsNative.h
+++ b/talk/app/webrtc/objc/RTCMediaConstraintsNative.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCMediaSource+Internal.h
+++ b/talk/app/webrtc/objc/RTCMediaSource+Internal.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCMediaSource.mm
+++ b/talk/app/webrtc/objc/RTCMediaSource.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCMediaStream+Internal.h
+++ b/talk/app/webrtc/objc/RTCMediaStream+Internal.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCMediaStream.mm
+++ b/talk/app/webrtc/objc/RTCMediaStream.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCMediaStreamTrack+Internal.h
+++ b/talk/app/webrtc/objc/RTCMediaStreamTrack+Internal.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCMediaStreamTrack.mm
+++ b/talk/app/webrtc/objc/RTCMediaStreamTrack.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCNSGLVideoView.m
+++ b/talk/app/webrtc/objc/RTCNSGLVideoView.m
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCOpenGLVideoRenderer.mm
+++ b/talk/app/webrtc/objc/RTCOpenGLVideoRenderer.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2014, Google Inc.
+ * Copyright 2014 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCPair.m
+++ b/talk/app/webrtc/objc/RTCPair.m
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCPeerConnection+Internal.h
+++ b/talk/app/webrtc/objc/RTCPeerConnection+Internal.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCPeerConnection.mm
+++ b/talk/app/webrtc/objc/RTCPeerConnection.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm
+++ b/talk/app/webrtc/objc/RTCPeerConnectionFactory.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCPeerConnectionObserver.h
+++ b/talk/app/webrtc/objc/RTCPeerConnectionObserver.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCPeerConnectionObserver.mm
+++ b/talk/app/webrtc/objc/RTCPeerConnectionObserver.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCSessionDescription+Internal.h
+++ b/talk/app/webrtc/objc/RTCSessionDescription+Internal.h
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/talk/app/webrtc/objc/RTCSessionDescription.mm
+++ b/talk/app/webrtc/objc/RTCSessionDescription.mm
@ -1,6 +1,6 @@
 /*
 * libjingle
- * Copyright 2013, Google Inc.
+ * Copyright 2013 Google Inc.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
--- a/Show More
+++ b/Show More