merge heads

2012-12-10 15:00:48 -08:00
parent 87f60daa3a 8a9fd12c74
commit 9216e8b97c
3 changed files with 3 additions and 3 deletions
@@ -11,6 +11,6 @@
 split.density=false
 proguard.config=proguard.cfg
 # Project target.
-target=android-16
+target=android-17
 android.library.reference.1=../MyTracksLib
 android.library.reference.2=../google-play-services_lib
@@ -9,4 +9,4 @@

 android.library=true
 # Project target.
-target=android-16
+target=android-17
@@ -10,4 +10,4 @@
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
-target=android-16
+target=android-17