diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-10-11 09:20:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-11 09:20:39 -0700 |
| commit | bb5923433cdba892e714aa33cbf6525cbd53a17c (patch) | |
| tree | 010c276cc925536eb626b6be7e063aea5cbbef82 /core | |
| parent | cf80c6c73541bcfbc7f787834f9b9e7807f52ef8 (diff) | |
| parent | 8483e4f007499d01901f73510b6b096f4e8b31bf (diff) | |
| download | base-bb5923433cdba892e714aa33cbf6525cbd53a17c.tar.gz | |
am 8483e4f0: Merge "Add internal resource symbol used by WebViewChromium." into klp-dev
* commit '8483e4f007499d01901f73510b6b096f4e8b31bf':
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" /> |