merge heads

MyTracks/libs/README.txt

@@ -3,10 +3,21 @@ own licenses, which allow their usage for the My Tracks application. Any other
 applications that wish to use these files should consult the appropriate
 licenses or the JAR's authors.
 
-google-api-client/
-- see http://code.google.com/p/google-api-java-client/.
-- contains Google API client library, google-api-client-1.5.0-beta.jar, and its
-  dependencies.
+Android Support Package:
+android-support-v4.jar
+- see http://developer.android.com/sdk/compatibility-library.html
+
+Google APIs Client Library for Java:
+commons-codec-1.3.jar
+commons-logging-1.1.1.jar
+google-api-client-1.5.0-beta.jar
+google-http-client-1.5.0-beta.jar
+google-oauth-client-1.5.0-beta.jar
+gson-1.6.jar
+guava-r09.jar
+jackson-core-asl-1.6.7.jar
+jsr305-1.3.9.jar
+- see http://code.google.com/p/google-api-java-client/
 - google-api-client-1.5.0-beta.jar depends on protobuf-java-2.2.0.jar, however,
   MyTracksLib already includes protobuf-java.2.3.0-lite.jar. Thus using the
   newer version, protobuf-java.2.3.0-lite.jar.
@@ -14,9 +25,9 @@ google-api-client/
   some of its classes are already included in the android framework, thus not
   including xpp3-1.1.4c.jar.
 
-google-common.jar
-
-googleloginclient-helper.jar
-
+Google Analytics:
 libGoogleAnalytics.jar
-- see http://code.google.com/mobile/analytics/docs/.
+- see http://code.google.com/apis/analytics/docs/mobile/android.html
+
+Others:
+google-common.jar