From f16f7b08c8eab319e84a6962b72ff423258b8ee9 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 25 Oct 2011 11:50:06 -0700
Subject: [PATCH] merge heads

---
 MyTracks/.classpath                          | 6 +++---
 MyTracks/project.properties                  | 2 +-
 MyTracksApiSample/.classpath                 | 6 +++---
 MyTracksApiSample/project.properties         | 2 +-
 MyTracksLib/.classpath                       | 3 +--
 MyTracksTest/.classpath                      | 2 --
 MyTracksTest/project.properties              | 1 -
 SignalStrengthSampler/.classpath             | 5 ++---
 SignalStrengthSampler/project.properties     | 2 +-
 SignalStrengthSamplerTest/.classpath         | 7 +++----
 SignalStrengthSamplerTest/project.properties | 1 -
 11 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/MyTracks/.classpath b/MyTracks/.classpath
index 4ad298fcf..0e176d3ac 100644
--- a/MyTracks/.classpath
+++ b/MyTracks/.classpath
@@ -2,10 +2,10 @@
 <classpath>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="lib" path="libs/googleloginclient-helper.jar"/>
-	<classpathentry kind="lib" path="libs/google-common.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-common.jar"/>
 	<classpathentry kind="lib" path="libs/libGoogleAnalytics.jar"/>
 	<classpathentry kind="lib" path="libs/google-api-client/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="libs/google-api-client/commons-logging-1.1.1.jar"/>
+	<classpathentry exported="true" kind="lib" path="libs/google-api-client/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="libs/google-api-client/google-api-client-1.5.0-beta.jar"/>
 	<classpathentry kind="lib" path="libs/google-api-client/google-http-client-1.5.0-beta.jar"/>
 	<classpathentry kind="lib" path="libs/google-api-client/google-oauth-client-1.5.0-beta.jar"/>
@@ -16,6 +16,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
-	<classpathentry 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/MyTracks/project.properties b/MyTracks/project.properties
index b7eae5a54..f4def9fb2 100644
--- a/MyTracks/project.properties
+++ b/MyTracks/project.properties
@@ -9,7 +9,7 @@
 
 # Indicates whether an apk should be generated for each density.
 split.density=false
-android.library.reference.1=../MyTracksLib/
 proguard.config=proguard.cfg
 # Project target.
 target=Google Inc.:Google APIs:14
+android.library.reference.1=../MyTracksLib
diff --git a/MyTracksApiSample/.classpath b/MyTracksApiSample/.classpath
index 57646597a..19a750438 100644
--- a/MyTracksApiSample/.classpath
+++ b/MyTracksApiSample/.classpath
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/MyTracksApiSample/project.properties b/MyTracksApiSample/project.properties
index 914196099..4fa228179 100644
--- a/MyTracksApiSample/project.properties
+++ b/MyTracksApiSample/project.properties
@@ -7,6 +7,6 @@
 # "ant.properties", and override values to adapt the script to your
 # project structure.
 
-android.library.reference.1=../MyTracksLib
 # Project target.
 target=android-14
+android.library.reference.1=../MyTracksLib
diff --git a/MyTracksLib/.classpath b/MyTracksLib/.classpath
index 0e5b2bd7e..996e75add 100644
--- a/MyTracksLib/.classpath
+++ b/MyTracksLib/.classpath
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry exported="true" kind="lib" path="libs/protobuf-java-2.3.0-lite.jar"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry 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 b5bc8a785..e7b9e07b8 100644
--- a/MyTracksTest/.classpath
+++ b/MyTracksTest/.classpath
@@ -10,7 +10,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/MyTracks"/>
-	<classpathentry kind="lib" path="/MyTracks/libs/google-common.jar"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/MyTracksTest/project.properties b/MyTracksTest/project.properties
index 7069fffe4..db55d0a24 100644
--- a/MyTracksTest/project.properties
+++ b/MyTracksTest/project.properties
@@ -11,4 +11,3 @@
 split.density=false
 # Project target.
 target=Google Inc.:Google APIs:14
-android.library.reference.1=../MyTracksLib
diff --git a/SignalStrengthSampler/.classpath b/SignalStrengthSampler/.classpath
index 2a5aade0a..0ca188f97 100644
--- a/SignalStrengthSampler/.classpath
+++ b/SignalStrengthSampler/.classpath
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
-	<classpathentry 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/SignalStrengthSampler/project.properties b/SignalStrengthSampler/project.properties
index de8aeac70..2ff7cc10d 100644
--- a/SignalStrengthSampler/project.properties
+++ b/SignalStrengthSampler/project.properties
@@ -7,7 +7,7 @@
 # "ant.properties", and override values to adapt the script to your
 # project structure.
 
-android.library.reference.1=../MyTracksLib/
 proguard.config=proguard.cfg
 # Project target.
 target=android-14
+android.library.reference.1=../MyTracksLib
diff --git a/SignalStrengthSamplerTest/.classpath b/SignalStrengthSamplerTest/.classpath
index b4f293c25..ea6042d8c 100644
--- a/SignalStrengthSamplerTest/.classpath
+++ b/SignalStrengthSamplerTest/.classpath
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/SignalStrengthSampler"/>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="libs/AndroidMockRuntime.jar"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="lib" path="libs/AndroidMockRuntime.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/SignalStrengthSampler"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/SignalStrengthSamplerTest/project.properties b/SignalStrengthSamplerTest/project.properties
index 4fa228179..730e911f2 100644
--- a/SignalStrengthSamplerTest/project.properties
+++ b/SignalStrengthSamplerTest/project.properties
@@ -9,4 +9,3 @@
 
 # Project target.
 target=android-14
-android.library.reference.1=../MyTracksLib