Merge heads

2012-07-06 14:41:50 +08:00
parent 9a24f12e11
commit 812ca57d42
180 changed files with 1201 additions and 737 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>