Merge heads

2013-02-26 10:51:24 +08:00
parent d740f5a09d
commit da04450a2b
40 changed files with 326 additions and 182 deletions
@@ -4,7 +4,7 @@ applications that wish to use these files should consult the appropriate
 licenses or the JAR's authors.

 Android Support Package:
-android-support-v4.jar
+android-support-v4.jar (version 11)

 Ant+:
 antlib.jar - see http://www.thisisant.com/pages/developer-zone/android-api