diff options
| author | Adam Powell <adamp@google.com> | 2014-05-15 15:38:37 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2014-05-15 15:38:37 -0700 |
| commit | ccfa115952b0d4a4e66d9178fa0ec40801192880 (patch) | |
| tree | 2d7f7fc65ffd8003df34a65672b9a37194815d4b /api | |
| parent | 1a0c96696e538595e6e65561f53bc544f1d9733d (diff) | |
| download | frameworks_base-ccfa115952b0d4a4e66d9178fa0ec40801192880.zip frameworks_base-ccfa115952b0d4a4e66d9178fa0ec40801192880.tar.gz frameworks_base-ccfa115952b0d4a4e66d9178fa0ec40801192880.tar.bz2 | |
Update mismerged current.txt
Change-Id: If16b714ef4cfcdc3c63cf21159390040237a3e78
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/api/current.txt b/api/current.txt index 17339c9..8cf30d7 100644 --- a/api/current.txt +++ b/api/current.txt @@ -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 |