Merge heads

2013-03-01 10:24:11 +08:00
parent 4422dd8066
commit e1e1932071
83 changed files with 587 additions and 996 deletions
@@ -26,7 +26,7 @@ limitations under the License.
  -->
  <uses-sdk
    android:minSdkVersion="8"
-    android:targetSdkVersion="16" />
+    android:targetSdkVersion="17" />

  <application
    android:icon="@drawable/my_tracks_icon"