Hyunyoung Song e612775922 resolved conflicts for merge of 13ef17a3 to mnc-dr-dev ...

b/22609402
Change-Id: I140cf972d57e14737a6f91c0b4a8ec6c7ff1af2b

2015-07-22 11:31:04 -07:00

..

all_apps_button.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

all_apps_container.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

all_apps_empty_search.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

all_apps_icon.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

all_apps_prediction_bar_icon.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

all_apps_search_bar.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

all_apps.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

app_icon.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

appwidget_error.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

appwidget_not_ready.xml

Updating the ui for widget restore flow

2014-08-12 16:00:03 -07:00

dummy_widget.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

folder_application.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

folder_icon.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

hotseat.xml

Clearing some android list errors/warnings.

2014-11-03 11:39:27 -08:00

launcher_overlay_example.xml

Clearing some android list errors/warnings.

2014-11-03 11:39:27 -08:00

launcher_overlay.xml

Allow LauncherOverlay to access and manage insets

2014-10-24 11:47:30 -07:00

longpress_cling_content.xml

Updating Clings UI

2014-08-27 10:57:03 -07:00

longpress_cling_welcome_content.xml

Updating Clings UI

2014-08-27 10:57:03 -07:00

overview_panel.xml

Using LinearLayout for overview panel

2014-10-16 15:39:25 -07:00

page_indicator_marker.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

page_indicator.xml

Clearing some android list errors/warnings.

2014-11-03 11:39:27 -08:00

search_drop_target_bar.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

user_folder.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

widget_cell.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

widgets_list_row_view.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

widgets_view.xml

resolved conflicts for merge of 13ef17a3 to mnc-dr-dev

2015-07-22 11:31:04 -07:00

workspace_screen.xml

Clearing some android list errors/warnings.

2014-11-03 11:39:27 -08:00