Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f089901b authored by Glenn Kasten's avatar Glenn Kasten Committed by Android Git Automerger
Browse files

am 6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to keep the" 

* commit '6a2d62c1':
  Manually merge change #111620 from tc3 to mainline, to keep the
parents 442fabda 6a2d62c1

tools/resampler_tools/Android.mk

+1 −1
Original line number Diff line number Diff line 
# Copyright 2005 Google Inc. All Rights Reserved.

# Copyright 2005 The Android Open Source Project

#

# Android.mk for resampler_tools 

#

tools/resampler_tools/fir.cpp

+2 −2
Original line number Diff line number Diff line 
/*

 * 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.