merge heads

2012-04-07 10:13:16 -07:00
parent 0ed45e40c6
commit 54bfe5d4b4
38 changed files with 2028 additions and 2665 deletions
@@ -4,8 +4,8 @@ applications that wish to use these files should consult the appropriate
 licenses or the JAR's authors.

 Android Support Package:
-android-support-v4.jar
- see http://developer.android.com/sdk/compatibility-library.html
+android-support-v4-r7-googlemaps.jar
+- see https://github.com/petedoyle/android-support-v4-googlemaps

 Google APIs Client Library for Java:
 commons-codec-1.3.jar