Merge branch 'refs/heads/sdl_android_parent/hotfix' into sdl_android_parent/master

Signed-off-by: Mike Burke <mike@livioconnect.com>

Conflicts:
	sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java

Author: Mike Burke

sdl_android_lib/src/com/smartdevicelink/protocol/enums/FunctionID.java

@@ -43,7 +43,6 @@ public class FunctionID {
 	public static final String RESET_GLOBAL_PROPERTIES = "ResetGlobalProperties";
 	public static final String SET_APP_ICON = "SetAppIcon";
 	public static final String CHANGE_REGISTRATION = "ChangeRegistration";
-	public static final String CHANGE_LANGUAGE_REGISTRATION = "ChangeLanguageRegistration";
 	public static final String SET_DISPLAY_LAYOUT = "SetDisplayLayout";
 	public static final String ON_LANGUAGE_CHANGE = "OnLanguageChange";
 	public static final String PERFORM_AUDIO_PASS_THRU = "PerformAudioPassThru";

sdl_android_lib/src/com/smartdevicelink/proxy/rpc/ChangeRegistrationResponse.java

@@ -16,7 +16,7 @@ public class ChangeRegistrationResponse extends RPCResponse {
 	 * Constructs a new ChangeRegistrationResponse object
 	 */
     public ChangeRegistrationResponse() {
-        super(FunctionID.CHANGE_LANGUAGE_REGISTRATION);
+        super(FunctionID.CHANGE_REGISTRATION);
     }
 
 	/**
@@ -30,4 +30,4 @@ public ChangeRegistrationResponse() {
     public ChangeRegistrationResponse(Hashtable<String, Object> hash) {
         super(hash);
     }
-}
+}