Merge branch 'master' of github.com:OfficeDev/Office-365-SDK-for-Android

* 'master' of github.com:OfficeDev/Office-365-SDK-for-Android:
  Removing invalid settings

Author: Marcos Torres

samples/simple-exchange-sample/app/src/main/java/com/microsoft/simple_exchange_sample/ServiceConstants.java

@@ -15,10 +15,10 @@
 public class ServiceConstants {
     public static final String AUTHORITY_URL = "https://login.windows.net/common";
     public static final String RESOURCE_ID = "https://outlook.office365.com/";
-    public static final String REDIRECT_URL = "https://junction.onmicrosoft.com/getO365AccessToken";
-    public static final String CLIENT_ID = "a69d48a4-4335-4e83-aaf3-7ab834e949fb";
+    public static final String REDIRECT_URL = "";
+    public static final String CLIENT_ID = "";
     public static final String ENCRYPTION_KEY = "EncryptionKey";
     // it is generally the case for O365 services that the endpoint ID is the concatenation
     // RESOURCE_ID and the api version. Please check against your actual deployment
     public static final String ENDPOINT_ID = RESOURCE_ID + "api/v1.0";
-}
+}