Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4918e7ad authored by Chet Haase's avatar Chet Haase
Browse files

resolved conflicts for merge of 09ed0720 to master 

Change-Id: I1ce1b48a9fb954caf4fd15237f2f608ac9c478fe
parents 79a5feff 09ed0720

CleanSpec.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -176,6 +176,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/print/IPrinterDiscoverySessionClient.*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/print/IPrinterDiscoverySessionClient.*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/os/IBattery*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/os/IBattery*)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates)

# ************************************************

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************
 
# ************************************************

api/current.txt

+130 −165

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/animation/Animator.java

+3 −13

File changed.

Preview size limit exceeded, changes collapsed.

core/java/android/animation/PropertyValuesHolder.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -636,7 +636,7 @@ public class PropertyValuesHolder implements Cloneable { 
    }

    }





    /**

    /**

     * The TypeEvaluator will the automatically determined based on the type of values

     * The TypeEvaluator will be automatically determined based on the type of values

     * supplied to PropertyValuesHolder. The evaluator can be manually set, however, if so

     * supplied to PropertyValuesHolder. The evaluator can be manually set, however, if so

     * desired. This may be important in cases where either the type of the values supplied

     * desired. This may be important in cases where either the type of the values supplied

     * do not match the way that they should be interpolated between, or if the values

     * do not match the way that they should be interpolated between, or if the values