Hyunyoung Song e1d69c9d5a resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp ...

Change-Id: Iec5916b2323d0fb36b4d619da9e6c4e0d57a9b56

2015-07-22 13:06:28 -07:00

..

app_target_browser.xml

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

app_target_camera.xml

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

app_target_email.xml

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

app_target_gallery.xml

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

app_target_messenger.xml

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -07:00

app_target_phone.xml

resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp

2015-07-22 13:06:28 -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-dev-plus-aosp

2015-07-22 13:06:28 -07:00