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

Commit 5c8072df authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

am ebbc891a: Merge "Fix build." into mnc-dev 

* commit 'ebbc891a':
  Fix build.
parents 22057e06 ebbc891a

tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ public class Config { 
    }



    public static String getTime(int platformVersion) {

        if (isGreaterOrEqual(platformVersion, MNC)) {

        if (isGreaterOrEqual(platformVersion, M)) {

            return "6:00";

        }

        if (platformVersion < GINGERBREAD) {
@@ -95,7 +95,7 @@ public class Config { 
        if (platformVersion < LOLLIPOP_MR1) {

            return "5:00";

        }

        if (platformVersion < MNC) {

        if (platformVersion < M) {

            return "5:10";

        }

        // Should never happen.