diff options
| author | Glenn Kasten <gkasten@android.com> | 2012-10-17 15:07:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-17 15:07:05 -0700 |
| commit | f089901bb9b2b1f457a03ede5feb94989a640210 (patch) | |
| tree | 61d9c0aafc6a1fc5b017fcb4bfa8476b50d62266 | |
| parent | 442fabda0bf6ce584c002a634a362081bdc0eddf (diff) | |
| parent | 6a2d62c1a972da25de53b1718c165f2b7df85a0e (diff) | |
| download | frameworks_av-f089901bb9b2b1f457a03ede5feb94989a640210.zip frameworks_av-f089901bb9b2b1f457a03ede5feb94989a640210.tar.gz frameworks_av-f089901bb9b2b1f457a03ede5feb94989a640210.tar.bz2 | |
am 6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to keep the"
* commit '6a2d62c1a972da25de53b1718c165f2b7df85a0e':
Manually merge change #111620 from tc3 to mainline, to keep the
| -rw-r--r-- | tools/resampler_tools/Android.mk | 2 | ||||
| -rw-r--r-- | tools/resampler_tools/fir.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
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 @@ 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 + |