merge heads

2012-03-23 11:08:01 -07:00
parent 3dd52ea523 8138f7a5d6
commit 70f592e967
87 changed files with 171 additions and 232 deletions
@@ -41,7 +41,7 @@ limitations under the License.
    android:title="@string/menu_markers"/>

  <item
-    android:icon="@drawable/chart_settings"
+    android:icon="@drawable/ic_menu_chartsettings"
    android:id="@+id/menu_chart_settings"
    android:showAsAction="ifRoom"
    android:title="@string/menu_chart_view_chart_settings"