Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build after merge.

Browse Source 
Change-Id: Iccb1c5a12d453d70eea7e1e3d64d97bc75987bef
This commit is contained in:
Jeff Sharkey
2016-06-03 14:34:16 -06:00
parent f5b0bf3563
commit 9351225839
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
api/current.txt
View File

@@ -1039,7 +1039,7 @@ package android {
field public static final int rotation = 16843558; // 0x1010326
field public static final int rotationX = 16843559; // 0x1010327
field public static final int rotationY = 16843560; // 0x1010328
field public static final int roundIcon = 16844083; // 0x1010533
field public static final int roundIcon = 16844080; // 0x1010530
field public static final int rowCount = 16843637; // 0x1010375
field public static final int rowDelay = 16843216; // 0x10101d0
field public static final int rowEdgeFlags = 16843329; // 0x1010241
@@ -1107,14 +1107,14 @@ package android {
field public static final int shareInterpolator = 16843195; // 0x10101bb
field public static final int sharedUserId = 16842763; // 0x101000b
field public static final int sharedUserLabel = 16843361; // 0x1010261
field public static final int shortcutCategories = 16844080; // 0x1010530
field public static final int shortcutDisabledMessage = 16844079; // 0x101052f
field public static final int shortcutIcon = 16844076; // 0x101052c
field public static final int shortcutId = 16844075; // 0x101052b
field public static final int shortcutIntentAction = 16844081; // 0x1010531
field public static final int shortcutIntentData = 16844082; // 0x1010532
field public static final int shortcutLongLabel = 16844078; // 0x101052e
field public static final int shortcutShortLabel = 16844077; // 0x101052d
field public static final int shortcutCategories = 16844077; // 0x101052d
field public static final int shortcutDisabledMessage = 16844076; // 0x101052c
field public static final int shortcutIcon = 16844073; // 0x1010529
field public static final int shortcutId = 16844072; // 0x1010528
field public static final int shortcutIntentAction = 16844078; // 0x101052e
field public static final int shortcutIntentData = 16844079; // 0x101052f
field public static final int shortcutLongLabel = 16844075; // 0x101052b
field public static final int shortcutShortLabel = 16844074; // 0x101052a
field public static final int shouldDisableView = 16843246; // 0x10101ee
field public static final int showAsAction = 16843481; // 0x10102d9
field public static final int showDefault = 16843258; // 0x10101fa

18
api/system-current.txt
View File

@@ -1145,7 +1145,7 @@ package android {
field public static final int rotation = 16843558; // 0x1010326
field public static final int rotationX = 16843559; // 0x1010327
field public static final int rotationY = 16843560; // 0x1010328
field public static final int roundIcon = 16844083; // 0x1010533
field public static final int roundIcon = 16844080; // 0x1010530
field public static final int rowCount = 16843637; // 0x1010375
field public static final int rowDelay = 16843216; // 0x10101d0
field public static final int rowEdgeFlags = 16843329; // 0x1010241
@@ -1217,14 +1217,14 @@ package android {
field public static final int shareInterpolator = 16843195; // 0x10101bb
field public static final int sharedUserId = 16842763; // 0x101000b
field public static final int sharedUserLabel = 16843361; // 0x1010261
field public static final int shortcutCategories = 16844080; // 0x1010530
field public static final int shortcutDisabledMessage = 16844079; // 0x101052f
field public static final int shortcutIcon = 16844076; // 0x101052c
field public static final int shortcutId = 16844075; // 0x101052b
field public static final int shortcutIntentAction = 16844081; // 0x1010531
field public static final int shortcutIntentData = 16844082; // 0x1010532
field public static final int shortcutLongLabel = 16844078; // 0x101052e
field public static final int shortcutShortLabel = 16844077; // 0x101052d
field public static final int shortcutCategories = 16844077; // 0x101052d
field public static final int shortcutDisabledMessage = 16844076; // 0x101052c
field public static final int shortcutIcon = 16844073; // 0x1010529
field public static final int shortcutId = 16844072; // 0x1010528
field public static final int shortcutIntentAction = 16844078; // 0x101052e
field public static final int shortcutIntentData = 16844079; // 0x101052f
field public static final int shortcutLongLabel = 16844075; // 0x101052b
field public static final int shortcutShortLabel = 16844074; // 0x101052a
field public static final int shouldDisableView = 16843246; // 0x10101ee
field public static final int showAsAction = 16843481; // 0x10102d9
field public static final int showDefault = 16843258; // 0x10101fa

18
api/test-current.txt
View File

@@ -1039,7 +1039,7 @@ package android {
field public static final int rotation = 16843558; // 0x1010326
field public static final int rotationX = 16843559; // 0x1010327
field public static final int rotationY = 16843560; // 0x1010328
field public static final int roundIcon = 16844083; // 0x1010533
field public static final int roundIcon = 16844080; // 0x1010530
field public static final int rowCount = 16843637; // 0x1010375
field public static final int rowDelay = 16843216; // 0x10101d0
field public static final int rowEdgeFlags = 16843329; // 0x1010241
@@ -1107,14 +1107,14 @@ package android {
field public static final int shareInterpolator = 16843195; // 0x10101bb
field public static final int sharedUserId = 16842763; // 0x101000b
field public static final int sharedUserLabel = 16843361; // 0x1010261
field public static final int shortcutCategories = 16844080; // 0x1010530
field public static final int shortcutDisabledMessage = 16844079; // 0x101052f
field public static final int shortcutIcon = 16844076; // 0x101052c
field public static final int shortcutId = 16844075; // 0x101052b
field public static final int shortcutIntentAction = 16844081; // 0x1010531
field public static final int shortcutIntentData = 16844082; // 0x1010532
field public static final int shortcutLongLabel = 16844078; // 0x101052e
field public static final int shortcutShortLabel = 16844077; // 0x101052d
field public static final int shortcutCategories = 16844077; // 0x101052d
field public static final int shortcutDisabledMessage = 16844076; // 0x101052c
field public static final int shortcutIcon = 16844073; // 0x1010529
field public static final int shortcutId = 16844072; // 0x1010528
field public static final int shortcutIntentAction = 16844078; // 0x101052e
field public static final int shortcutIntentData = 16844079; // 0x101052f
field public static final int shortcutLongLabel = 16844075; // 0x101052b
field public static final int shortcutShortLabel = 16844074; // 0x101052a
field public static final int shouldDisableView = 16843246; // 0x10101ee
field public static final int showAsAction = 16843481; // 0x10102d9
field public static final int showDefault = 16843258; // 0x10101fa