diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2015-07-21 17:01:26 -0700 |
|---|---|---|
| committer | Ed Heyl <edheyl@google.com> | 2015-07-22 11:31:04 -0700 |
| commit | e612775922ec9f8cc4e5cb976bc62b3312a3de0e (patch) | |
| tree | 96beaf07307486f6491f022da63ebe381765d1a8 /res/drawable-xxxhdpi | |
| parent | a83129f0bc778fd1ccd799bd8cfa40270f632e1d (diff) | |
| download | android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.gz android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.tar.bz2 android_packages_apps_Trebuchet-e612775922ec9f8cc4e5cb976bc62b3312a3de0e.zip | |
resolved conflicts for merge of 13ef17a3 to mnc-dr-dev
b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b
Diffstat (limited to 'res/drawable-xxxhdpi')
14 files changed, 0 insertions, 0 deletions
diff --git a/res/drawable-xxxhdpi/ic_arrow_back_grey.png b/res/drawable-xxxhdpi/ic_arrow_back_grey.png Binary files differnew file mode 100755 index 000000000..854a9bd1a --- /dev/null +++ b/res/drawable-xxxhdpi/ic_arrow_back_grey.png diff --git a/res/drawable-xxxhdpi/ic_info_launcher.png b/res/drawable-xxxhdpi/ic_info_launcher.png Binary files differnew file mode 100644 index 000000000..bf39e5be2 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_info_launcher.png diff --git a/res/drawable-xxxhdpi/ic_remove_launcher.png b/res/drawable-xxxhdpi/ic_remove_launcher.png Binary files differnew file mode 100644 index 000000000..7043be015 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_remove_launcher.png diff --git a/res/drawable-xxxhdpi/ic_search_grey.png b/res/drawable-xxxhdpi/ic_search_grey.png Binary files differnew file mode 100755 index 000000000..28519fda6 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_search_grey.png diff --git a/res/drawable-xxxhdpi/ic_uninstall_launcher.png b/res/drawable-xxxhdpi/ic_uninstall_launcher.png Binary files differnew file mode 100644 index 000000000..77a3302f6 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_uninstall_launcher.png diff --git a/res/drawable-xxxhdpi/ic_widget_resize_handle.png b/res/drawable-xxxhdpi/ic_widget_resize_handle.png Binary files differnew file mode 100644 index 000000000..4bde6b9a6 --- /dev/null +++ b/res/drawable-xxxhdpi/ic_widget_resize_handle.png diff --git a/res/drawable-xxxhdpi/portal_ring_inner.png b/res/drawable-xxxhdpi/portal_ring_inner.png Binary files differnew file mode 100644 index 000000000..34a359997 --- /dev/null +++ b/res/drawable-xxxhdpi/portal_ring_inner.png diff --git a/res/drawable-xxxhdpi/portal_ring_inner_nolip.png b/res/drawable-xxxhdpi/portal_ring_inner_nolip.png Binary files differnew file mode 100644 index 000000000..8cebb3535 --- /dev/null +++ b/res/drawable-xxxhdpi/portal_ring_inner_nolip.png diff --git a/res/drawable-xxxhdpi/portal_ring_outer.png b/res/drawable-xxxhdpi/portal_ring_outer.png Binary files differnew file mode 100644 index 000000000..d2df32267 --- /dev/null +++ b/res/drawable-xxxhdpi/portal_ring_outer.png diff --git a/res/drawable-xxxhdpi/portal_ring_rest.png b/res/drawable-xxxhdpi/portal_ring_rest.png Binary files differnew file mode 100644 index 000000000..11e92eeb6 --- /dev/null +++ b/res/drawable-xxxhdpi/portal_ring_rest.png diff --git a/res/drawable-xxxhdpi/quantum_panel_bitmap.9.png b/res/drawable-xxxhdpi/quantum_panel_bitmap.9.png Binary files differnew file mode 100644 index 000000000..bc887fe91 --- /dev/null +++ b/res/drawable-xxxhdpi/quantum_panel_bitmap.9.png diff --git a/res/drawable-xxxhdpi/quantum_panel_dark_bitmap.9.png b/res/drawable-xxxhdpi/quantum_panel_dark_bitmap.9.png Binary files differnew file mode 100644 index 000000000..7cfd6e477 --- /dev/null +++ b/res/drawable-xxxhdpi/quantum_panel_dark_bitmap.9.png diff --git a/res/drawable-xxxhdpi/widget_resize_frame.9.png b/res/drawable-xxxhdpi/widget_resize_frame.9.png Binary files differnew file mode 100644 index 000000000..cb609cef9 --- /dev/null +++ b/res/drawable-xxxhdpi/widget_resize_frame.9.png diff --git a/res/drawable-xxxhdpi/widget_resize_shadow.9.png b/res/drawable-xxxhdpi/widget_resize_shadow.9.png Binary files differnew file mode 100644 index 000000000..82c8b9c7c --- /dev/null +++ b/res/drawable-xxxhdpi/widget_resize_shadow.9.png |
