Merge "Manually merge change #111620 from tc3 to mainline, to keep the"

tools/resampler_tools/Android.mk

-# Copyright 2005 Google Inc. All Rights Reserved.
+# Copyright 2005 The Android Open Source Project
 #
 # Android.mk for resampler_tools 
 #

tools/resampler_tools/fir.cpp

 /*
- * 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 @@ int main(int argc, char** argv)
 // 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
+