diff options
| author | Adam Powell <adamp@google.com> | 2014-07-10 17:02:00 -0700 |
|---|---|---|
| committer | Adam Powell <adamp@google.com> | 2014-07-10 17:02:00 -0700 |
| commit | ffd4163fc6daea85ebd4388bd4d040aa6fbe1270 (patch) | |
| tree | c7a2773be8c70c4ef2976f7780509f1e3f862674 /api | |
| parent | 8e77c47d7c534b22c7f6a819791300ca5e30b9cc (diff) | |
| download | frameworks_base-ffd4163fc6daea85ebd4388bd4d040aa6fbe1270.zip frameworks_base-ffd4163fc6daea85ebd4388bd4d040aa6fbe1270.tar.gz frameworks_base-ffd4163fc6daea85ebd4388bd4d040aa6fbe1270.tar.bz2 | |
Fix bogus current.txt merge
Change-Id: Id60b61f16a47c11626829c4b50fe712acc5723b7
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/api/current.txt b/api/current.txt index ed38885..102afc1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -244,7 +244,7 @@ package android { field public static final int action = 16842797; // 0x101002d field public static final int actionBarDivider = 16843675; // 0x101039b field public static final int actionBarItemBackground = 16843676; // 0x101039c - field public static final int actionBarPopupTheme = 16843918; // 0x101048e + field public static final int actionBarPopupTheme = 16843919; // 0x101048f field public static final int actionBarSize = 16843499; // 0x10102eb field public static final int actionBarSplitStyle = 16843656; // 0x1010388 field public static final int actionBarStyle = 16843470; // 0x10102ce @@ -853,7 +853,7 @@ package android { field public static final int mirrorForRtl = 16843726; // 0x10103ce field public static final int mode = 16843134; // 0x101017e field public static final int moreIcon = 16843061; // 0x1010135 - field public static final int multiArch = 16843919; // 0x101048f + field public static final int multiArch = 16843920; // 0x1010490 field public static final int multiprocess = 16842771; // 0x1010013 field public static final int name = 16842755; // 0x1010003 field public static final int navigationBarColor = 16843860; // 0x1010454 |