Merge heads

2012-05-04 17:04:45 +08:00
parent a12f4bcbe8
commit fd90dcffa6
189 changed files with 3288 additions and 3323 deletions
@@ -29,7 +29,7 @@ limitations under the License.
    android:targetSdkVersion="15" />

  <application
-    android:icon="@drawable/arrow_icon"
+    android:icon="@drawable/my_tracks_icon"
    android:label="@string/lib_name" >
  </application>