android: fixing merge
<supports-screens android:smallScreens='true' android:normalScreens='true' android:largeScreens='true' android:xlargeScreens='true'/>
<application android:name='com.rhomobile.rhodes.RhodesApplication'
android:label='@string/app_name'
- android:icon='@drawable/icon'
android:icon='@mipmap/icon'
android:debuggable='<%= @debuggable %>'
android:allowBackup='<%= @allowBackup %>'>
