Merge heads

2013-07-04 10:08:14 +08:00
parent d106bc520e
commit 97f6afae3b
32 changed files with 83 additions and 471 deletions
@@ -25,5 +25,4 @@ limitations under the License.
    <item name="android:listViewWhiteStyle">@style/ListViewMyTracks.White</item>
    <item name="android:spinnerItemStyle">@style/SpinnerItemMyTracks</item>
  </style>
-  <style name="MyTracks.DialogWhenLarge" />
 </resources>