Merge "Eliminating dead logic - bitmap state simply cannot be null here."

Author: cco3

graphics/java/android/graphics/drawable/BitmapDrawable.java

@@ -474,10 +474,8 @@ private BitmapDrawable(BitmapState state, Resources res) {
         mBitmapState = state;
         if (res != null) {
             mTargetDensity = res.getDisplayMetrics().densityDpi;
-        } else if (state != null) {
-            mTargetDensity = state.mTargetDensity;
         } else {
-            mTargetDensity = DisplayMetrics.DENSITY_DEFAULT;
+            mTargetDensity = state.mTargetDensity;
         }
         setBitmap(state.mBitmap);
     }