diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-01-02 13:44:54 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-01-02 13:44:54 +0000 |
| commit | e6fc6c637811f2c69e1bd8c866d9a52080e7b0cf (patch) | |
| tree | 53e69a86583465c17e4b27d966f23a376c24bc7f /chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png | |
| parent | 6a06648d228363b777cbf15c41179e2d3926eee4 (diff) | |
| parent | 4aab98dbcc33a94cc58b884ecc623e56d6b0e03a (diff) | |
| download | android_frameworks_webview-e6fc6c637811f2c69e1bd8c866d9a52080e7b0cf.tar.gz android_frameworks_webview-e6fc6c637811f2c69e1bd8c866d9a52080e7b0cf.tar.bz2 android_frameworks_webview-e6fc6c637811f2c69e1bd8c866d9a52080e7b0cf.zip | |
Merge master-chromium into m33 at r241094
This commit was generated by merge_to_master.py.
Change-Id: Icfa82bbab9ec740b58774edc9faf8f0097847e5a
Diffstat (limited to 'chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png')
| -rw-r--r-- | chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png | bin | 0 -> 983 bytes |
1 files changed, 0 insertions, 0 deletions
diff --git a/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png Binary files differnew file mode 100644 index 0000000..26445cb --- /dev/null +++ b/chromium/overlay/frameworks/base/core/res/res/drawable/webviewchromium_pageinfo_warning_major.png |