Tentativa contador
Merge branch 'master' of https://github.com/Hugogoodpeople/Menuguru

Conflicts:
	Menuguru6/app/src/main/res/layout/row_especial.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/classes.j
ar

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/drawa
ble/com_facebook_button_blue.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/drawa
ble/com_facebook_button_check.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/drawa
ble/com_facebook_loginbutton_silver.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/drawa
ble/com_facebook_picker_item_background.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/drawa
ble/com_facebook_picker_list_selector.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/drawa
ble/com_facebook_picker_list_selector_background_transition.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/drawa
ble/com_facebook_picker_top_button.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/drawa
ble/com_facebook_top_background.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/drawa
ble/com_facebook_top_button.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/drawa
ble/com_facebook_usersettingsfragment_background_gradient.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_friendpickerfragment.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_login_activity_layout.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_picker_activity_circle_row.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_picker_checkbox.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_picker_image.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_picker_list_row.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_picker_list_section_header.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_picker_search_box.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_picker_title_bar.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_picker_title_bar_stub.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_placepickerfragment.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_placepickerfragment_list_row.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_search_bar_layout.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_tooltip_bubble.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/layou
t/com_facebook_usersettingsfragment.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s-de/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s-es/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s-fr/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s-hdpi-v4/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s-he/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s-it/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s-iw/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s-ldpi-v4/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s-mdpi-v4/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s-pt/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s-xhdpi-v4/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/debug/res/value
s/values.xml

Menuguru6/libraries/facebook/build/intermediates/bundles/release/classes
.jar

Menuguru6/libraries/facebook/build/intermediates/incremental/mergeAssets
/test/debug/merger.xml

Menuguru6/libraries/facebook/build/intermediates/incremental/mergeResour
ces/test/debug/merger.xml

Menuguru6/libraries/facebook/build/intermediates/incremental/packageReso
urces/debug/merger.xml

Menuguru6/libraries/facebook/build/intermediates/libs/facebook-debug-tes
t.ap_

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/drawable
/com_facebook_button_blue.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/drawable
/com_facebook_button_check.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/drawable
/com_facebook_loginbutton_silver.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/drawable
/com_facebook_picker_item_background.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/drawable
/com_facebook_picker_list_selector.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/drawable
/com_facebook_picker_list_selector_background_transition.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/drawable
/com_facebook_picker_top_button.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/drawable
/com_facebook_top_background.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/drawable
/com_facebook_top_button.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/drawable
/com_facebook_usersettingsfragment_background_gradient.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_friendpickerfragment.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_login_activity_layout.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_picker_activity_circle_row.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_picker_checkbox.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_picker_image.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_picker_list_row.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_picker_list_section_header.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_picker_search_box.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_picker_title_bar.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_picker_title_bar_stub.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_placepickerfragment.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_placepickerfragment_list_row.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_search_bar_layout.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_tooltip_bubble.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/layout/c
om_facebook_usersettingsfragment.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values-d
e/values.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values-e
s/values.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values-f
r/values.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values-h
dpi-v4/values.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values-h
e/values.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values-i
t/values.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values-i
w/values.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values-l
dpi-v4/values.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values-m
dpi-v4/values.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values-p
t/values.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values-x
hdpi-v4/values.xml

Menuguru6/libraries/facebook/build/intermediates/res/test/debug/values/v
alues.xml
	Menuguru6/libraries/facebook/build/outputs/aar/facebook.aar