From e149683da785dc22ef500e071670cef7029c1aab Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Fri, 6 Apr 2012 15:27:18 -0700
Subject: [PATCH] fix merge error

---
 MyTracksLib/.classpath  | 1 -
 MyTracksTest/.classpath | 1 -
 2 files changed, 2 deletions(-)

diff --git a/MyTracksLib/.classpath b/MyTracksLib/.classpath
index 2071d6032..0ca188f97 100644
--- a/MyTracksLib/.classpath
+++ b/MyTracksLib/.classpath
@@ -4,6 +4,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/MyTracksTest/.classpath b/MyTracksTest/.classpath
index 6a94c26bd..17b7b5ec6 100644
--- a/MyTracksTest/.classpath
+++ b/MyTracksTest/.classpath
@@ -10,6 +10,5 @@
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/MyTracks"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>