diff options
| author | Dan Bornstein <danfuzz@google.com> | 2008-10-03 10:34:57 -0700 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-10-17 11:24:39 -0700 |
| commit | 4cb4f7ce9184de9a221239c28afcf912e7e1ed43 (patch) | |
| tree | 6d653ee5b01f2322e86e47820495ba141b699128 /tools | |
| parent | 8cb08825a7ca647d5c8f4c7a38a2d39392cae5c8 (diff) | |
| download | frameworks_av-4cb4f7ce9184de9a221239c28afcf912e7e1ed43.zip frameworks_av-4cb4f7ce9184de9a221239c28afcf912e7e1ed43.tar.gz frameworks_av-4cb4f7ce9184de9a221239c28afcf912e7e1ed43.tar.bz2 | |
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>
Diffstat (limited to 'tools')
| -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 + |