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

Commit 4cb4f7ce authored Oct 03, 2008 by Dan Bornstein Committed by Glenn Kasten Oct 17, 2012

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>

parent 8cb08825

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.