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

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

Browse Source 
* commit 'e7b37bc20ec4ddb775b2af243a859e59da877423':
  Fix build.
This commit is contained in:
Dianne Hackborn
2015-08-01 16:52:37 +00:00
committed by Android Git Automerger
parent a2f5ed7f81 e7b37bc20e
commit e1f19370ff
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.