commit 4cb4f7ce9184de9a221239c28afcf912e7e1ed43
author Dan Bornstein <danfuzz@google.com> Fri Oct 03 10:34:57 2008 -0700
committer Glenn Kasten <gkasten@google.com> Wed Oct 17 11:24:39 2012 -0700
tree 6d653ee5b01f2322e86e47820495ba141b699128
parent 8cb08825a7ca647d5c8f4c7a38a2d39392cae5c8

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>

tools/resampler_tools/Android.mk

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 
 #