am 5d84b44b: am 72e8e080: am 074b3ceb: am f96d9c54: Merge "Improve resource loading by ~3x" into mnc-dev

* commit '5d84b44b416b5efd2d138c36e691d43396c1c1d8':
  Improve resource loading by ~3x

core/java/android/content/res/ColorStateList.java

@@ -603,7 +603,7 @@ public class ColorStateList implements Parcelable {
      * @hide only for resource preloading
      */
     public ConstantState<ColorStateList> getConstantState() {
-        if (mFactory != null) {
+        if (mFactory == null) {
             mFactory = new ColorStateListFactory(this);
         }
         return mFactory;

core/java/android/content/res/Resources.java

@@ -1918,6 +1918,7 @@ public class Resources {
             other.mResId = mResId;
             other.mForce = mForce;
             other.mCount = mCount;
+            other.mHashCode = mHashCode;
             return other;
         }
     }