Merge "Add additional density enums to android:screenDensity attribute" into mnc-dr-dev