Merge branch 'beta' into devel

Josh Deffibaugh · Josh Deffibaugh · commit b77266098ef8 · 2016-10-17T15:25:05.000-07:00
diff --git a/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java b/android-sdk/src/main/java/com/optimizely/ab/android/sdk/OptimizelyManager.java
@@ -164,15 +164,15 @@ public void stop(@NonNull Context context) {
     }
 
     /**
-     * Gets a chanced Optimizely instance
+     * Gets a cached Optimizely instance
      *
      * If {@link #start(Activity, OptimizelyStartListener)} or {@link #start(Context, OptimizelyStartListener)}
      * has not been called yet the returned {@link AndroidOptimizely} instance will be a dummy instance
      * that logs warnings in order to prevent {@link NullPointerException}.
      *
      * If {@link #getOptimizely(Context, int)} was used the built {@link AndroidOptimizely} instance
      * will be updated.  Using {@link #start(Activity, OptimizelyStartListener)} or {@link #start(Context, OptimizelyStartListener)}
-     * will update the cache instance with new {@link AndroidOptimizely} built from a cached local
+     * will update the cached instance with a new {@link AndroidOptimizely} built from a cached local
      * datafile on disk or a remote datafile on the CDN.
      * @return the cached instance of {@link AndroidOptimizely}
      */

Original file line number	Diff line number	Diff line change
`@@ -164,15 +164,15 @@ public void stop(@NonNull Context context) {`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`/**`
`167`		`- * Gets a chanced Optimizely instance`
	`167`	`+ * Gets a cached Optimizely instance`
`168`	`168`	`*`
`169`	`169`	`* If {@link #start(Activity, OptimizelyStartListener)} or {@link #start(Context, OptimizelyStartListener)}`
`170`	`170`	`* has not been called yet the returned {@link AndroidOptimizely} instance will be a dummy instance`
`171`	`171`	`* that logs warnings in order to prevent {@link NullPointerException}.`
`172`	`172`	`*`
`173`	`173`	`* If {@link #getOptimizely(Context, int)} was used the built {@link AndroidOptimizely} instance`
`174`	`174`	`* will be updated. Using {@link #start(Activity, OptimizelyStartListener)} or {@link #start(Context, OptimizelyStartListener)}`
`175`		`- * will update the cache instance with new {@link AndroidOptimizely} built from a cached local`
	`175`	`+ * will update the cached instance with a new {@link AndroidOptimizely} built from a cached local`
`176`	`176`	`* datafile on disk or a remote datafile on the CDN.`
`177`	`177`	`* @return the cached instance of {@link AndroidOptimizely}`
`178`	`178`	`*/`