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

..

app_target_browser.xml

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

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

app_target_camera.xml

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

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

app_target_email.xml

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

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

app_target_gallery.xml

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

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

app_target_messenger.xml

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

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

app_target_phone.xml

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

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

default_workspace_4x4.xml

Adding support for dynamically resolved default layouts.

2014-05-16 12:33:38 -07:00

default_workspace_5x5.xml

Adding support for dynamically resolved default layouts.

2014-05-16 12:33:38 -07:00

default_workspace_5x6.xml

Adding support for dynamically resolved default layouts.

2014-05-16 12:33:38 -07:00

launcher_preferences.xml

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

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