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

Update mismerged current.txt

Browse Source 
Change-Id: If16b714ef4cfcdc3c63cf21159390040237a3e78
This commit is contained in:
Adam Powell
2014-05-15 15:38:37 -07:00
parent 1a0c96696e
commit ccfa115952
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.txt
View File

@@ -417,10 +417,10 @@ package android {
field public static final int content = 16843355; // 0x101025b
field public static final int contentAuthority = 16843408; // 0x1010290
field public static final int contentDescription = 16843379; // 0x1010273
field public static final int contentInsetEnd = 16843861; // 0x1010455
field public static final int contentInsetLeft = 16843862; // 0x1010456
field public static final int contentInsetRight = 16843863; // 0x1010457
field public static final int contentInsetStart = 16843860; // 0x1010454
field public static final int contentInsetEnd = 16843864; // 0x1010458
field public static final int contentInsetLeft = 16843865; // 0x1010459
field public static final int contentInsetRight = 16843866; // 0x101045a
field public static final int contentInsetStart = 16843863; // 0x1010457
field public static final int controlX1 = 16843799; // 0x1010417
field public static final int controlX2 = 16843801; // 0x1010419
field public static final int controlY1 = 16843800; // 0x1010418