merge heads

2012-04-09 14:07:57 -07:00
parent 97f4103e67
commit 7b800914f6
62 changed files with 2918 additions and 2996 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