merge heads

2012-04-07 10:13:16 -07:00
parent 0ed45e40c6
commit 54bfe5d4b4
38 changed files with 2028 additions and 2665 deletions
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-Copyright 2010 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-->
-<resources>
-  <array name="left_icons">
-    <item>@drawable/left_arrow_chart_stateful</item>
-    <item>@drawable/left_arrow_track_stateful</item>
-    <item>@drawable/left_arrow_stats_stateful</item>
-  </array>
-
-  <array name="right_icons">
-    <item>@drawable/right_arrow_stats_stateful</item>
-    <item>@drawable/right_arrow_chart_stateful</item>
-    <item>@drawable/right_arrow_track_stateful</item>
-  </array>
-</resources>