drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix build." into mnc-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2015-07-31 18:19:11 +00:00
committed by Android (Google) Code Review
parent 37f559be42 e5d926deb2
commit ebbc891ae4
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/layoutlib/bridge/src/com/android/layoutlib/bridge/bars/Config.java
View File

@ -74,7 +74,7 @@ public class Config {
} }
public static String getTime(int platformVersion) { public static String getTime(int platformVersion) {
if (isGreaterOrEqual(platformVersion, MNC)) { if (isGreaterOrEqual(platformVersion, M)) {
return "6:00"; return "6:00";
} }
if (platformVersion < GINGERBREAD) { if (platformVersion < GINGERBREAD) {
@ -95,7 +95,7 @@ public class Config {
if (platformVersion < LOLLIPOP_MR1) { if (platformVersion < LOLLIPOP_MR1) {
return "5:00"; return "5:00";
} }
if (platformVersion < MNC) { if (platformVersion < M) {
return "5:10"; return "5:10";
} }
// Should never happen. // Should never happen.