commit a8719e1ff7d15c0359b138f49eb515de8615edb5
author Tingting Wang <tingtingw@google.com> Tue Aug 02 13:51:35 2016 -0700
committer Tingting Wang <tingtingw@google.com> Tue Aug 02 13:51:35 2016 -0700
tree 96ab1237917746870f4c43f5ea8612ee6b69f98b
parent 47957ad234de7253e95b41a8bc11e41b3b59e728
parent dce1e68dc18f08d4574dfe64740cdca0876d090b

resolve merge conflicts of dce1e68 to master

Change-Id: I1520967702ac5e1e84e259ef270644028a096c4d

res/values/colors.xml

diff --git a/res/values/colors.xml b/res/values/colors.xml
index f1b6f06..3efa80f 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -86,4 +86,7 @@
     <color name="swipe_refresh_color2">#dd4b37</color>
     <color name="swipe_refresh_color3">#4285f4</color>
     <color name="swipe_refresh_color4">#f4b400</color>
+
+    <!-- Color of hamburger icon in promo -->
+    <color name="hamburger_feature_highlight_inner_color">#00ffffff</color>
 </resources>