am f6faa4d2: am ea7c8dcb: am c61aabfa: Merge "Update material colors" into lmp-dev

* commit 'f6faa4d292186bd5927de59f96cfe7a2cb04156c':
  Update material colors
This commit is contained in:
Alan Viverette
2014-08-26 10:17:17 +00:00
committed by Android Git Automerger

View File

@@ -83,14 +83,14 @@
<!-- Default avatar colors -->
<color name="pink_500">#ffe91e63</color>
<color name="indigo_500">#ff3f51b5</color>
<color name="blue_500">@*android:color/material_blue_500</color>
<color name="teal_500">@*android:color/material_teal_500</color>
<color name="green_500">@*android:color/material_green_500</color>
<color name="blue_500">#ff4285f4</color>
<color name="teal_500">#ff00bcd4</color>
<color name="green_500">#ff0f9d58</color>
<color name="light_green_500">#ff8bc34a</color>
<color name="orange_500">@*android:color/material_orange_500</color>
<color name="deep_orange_500">@*android:color/material_deep_orange_500</color>
<color name="orange_500">#ffff9800</color>
<color name="deep_orange_500">#ffff5722</color>
<!-- Avatar color used for guest -->
<color name="grey_500">@*android:color/material_grey_500</color>
<color name="grey_500">#ff9e9e9e</color>
<color name="wifi_divider">#ffe0e0e0</color>