summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-10-11 16:17:41 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-10-11 16:17:42 +0000
commit8483e4f007499d01901f73510b6b096f4e8b31bf (patch)
treeff06bb186b823cedac428621f7cae992a8f96fa8 /core
parent8ca2d05293759dbcebcf99a6b787bfc09345f109 (diff)
parent740753c5b43a1ee77af42b9a44c89ac4dd10f344 (diff)
downloadbase-8483e4f007499d01901f73510b6b096f4e8b31bf.tar.gz
Merge "Add internal resource symbol used by WebViewChromium." into klp-dev
Diffstat (limited to 'core')
-rw-r--r--core/res/res/values/symbols.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index adcb3fb2db3b..cc1cfd33853c 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1615,7 +1615,7 @@
<java-symbol type="anim" name="push_up_out" />
<java-symbol type="anim" name="lock_screen_wallpaper_behind_enter" />
<java-symbol type="anim" name="lock_screen_behind_enter" />
-
+
<java-symbol type="bool" name="config_alwaysUseCdmaRssi" />
<java-symbol type="dimen" name="status_bar_icon_size" />
<java-symbol type="dimen" name="system_bar_icon_size" />
@@ -1737,6 +1737,7 @@
<!-- From Chromium-WebView -->
<java-symbol type="attr" name="actionModeWebSearchDrawable" />
<java-symbol type="string" name="websearch" />
+ <java-symbol type="drawable" name="ic_media_video_poster" />
<!-- From SubtitleView -->
<java-symbol type="dimen" name="subtitle_corner_radius" />