commit 78914e06f83bab85a513856b46684314cba366a2
author Glenn Kasten <gkasten@android.com> Wed Oct 17 15:09:25 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 17 15:09:25 2012 -0700
tree b8895143e131295336812af5689e2e79fa0a0d5f
parent a1ab3afa643111ff02221800e2cbdde2bda92dd9
parent 98d172313eb675b2a1960059527518a8609b2fbe

am 98d17231: am dbe1be24: Merge "Rename "Makefile" to "Android.mk" throughout the tree."

* commit '98d172313eb675b2a1960059527518a8609b2fbe':
  Rename "Makefile" to "Android.mk" throughout the tree.

tools/resampler_tools/Android.mk

diff --git a/tools/resampler_tools/Makefile b/tools/resampler_tools/Android.mk
similarity index 84%
rename from tools/resampler_tools/Makefile
rename to tools/resampler_tools/Android.mk
index 40f7a67..0c6aa47 100644
--- a/tools/resampler_tools/Makefile
+++ b/tools/resampler_tools/Android.mk
@@ -1,6 +1,6 @@
 # Copyright 2005 Google Inc. All Rights Reserved.
 #
-# Makefile for resampler_tools 
+# Android.mk for resampler_tools 
 #