diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-11 09:23:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 09:23:14 -0700 |
| commit | 6b9c8991a8ed5e5b250eda037f31302ff329784a (patch) | |
| tree | e91e48bc7ed756d1df92e85f4a8b5a1913fa66cf /core | |
| parent | 89d1ac638d6f69a3d974487135407cd001366ea2 (diff) | |
| parent | bb5923433cdba892e714aa33cbf6525cbd53a17c (diff) | |
| download | base-6b9c8991a8ed5e5b250eda037f31302ff329784a.tar.gz | |
am bb592343: am 8483e4f0: Merge "Add internal resource symbol used by WebViewChromium." into klp-dev
* commit 'bb5923433cdba892e714aa33cbf6525cbd53a17c':
Add internal resource symbol used by WebViewChromium.
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/symbols.xml | 3 |
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" /> |