Manually merge change #111620 from tc3 to mainline, to keep the
automerger from choking on it.
p4 sync
p4 integrate -r -b android_to_tc3 //...@111620,111620
p4 resolve -a
p4 resolve # resolve a couple merge travesties
PRESUBMIT=passed
BUG=1399648
TBR=edheyl
OCL=111902
Change-Id: I854b01553dd92bbf9c864f5a9bd51a3d665f0ac2
Signed-off-by: Glenn Kasten <gkasten@google.com>
diff --git a/tools/resampler_tools/Android.mk b/tools/resampler_tools/Android.mk
index 0c6aa47..e8cbe39 100644
--- a/tools/resampler_tools/Android.mk
+++ b/tools/resampler_tools/Android.mk
@@ -1,4 +1,4 @@
-# Copyright 2005 Google Inc. All Rights Reserved.
+# Copyright 2005 The Android Open Source Project
#
# Android.mk for resampler_tools
#
diff --git a/tools/resampler_tools/fir.cpp b/tools/resampler_tools/fir.cpp
index be33d54..377814f 100644
--- a/tools/resampler_tools/fir.cpp
+++ b/tools/resampler_tools/fir.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2007 Google Inc.
+ * Copyright (C) 2007 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.
@@ -118,4 +118,4 @@
// http://www.dsptutor.freeuk.com/KaiserFilterDesign/KaiserFilterDesign.html
// http://www.csee.umbc.edu/help/sound/AFsp-V2R1/html/audio/ResampAudio.html
-
\ No newline at end of file
+
