Merge heads

This commit is contained in:
youtaol
2013-07-10 14:19:41 +08:00
parent fd3940fcd0
commit 4debca0054
220 changed files with 359 additions and 293 deletions
+1 -1
View File
@@ -29,7 +29,7 @@ limitations under the License.
android:targetSdkVersion="17" />
<application
android:icon="@drawable/my_tracks_icon"
android:icon="@drawable/ic_launcher_my_tracks"
android:label="@string/lib_name" >
</application>