Merge heads

2012-07-03 20:07:00 +08:00
parent ec74968f94
commit 4dddea507f
180 changed files with 1218 additions and 735 deletions
@@ -51,6 +51,9 @@ limitations under the License.
  <!-- track widget line -->
  <color name="track_widget_line">#99999999</color>

+  <!-- track widget red -->
+  <color name="track_widget_red">#FFCA1F25</color>
+
  <!-- dynamic track slow path, green -->
  <color name="slow_path">#F774DF00</color>