diff options
| author | Craig Mautner <cmautner@google.com> | 2014-04-24 16:33:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-24 16:33:02 +0000 |
| commit | f8a5820817eb59e0fe16e3ce0f10bb3dca090192 (patch) | |
| tree | 49d78fb80f80c15b75f873bbbeaef0ea71b425c3 /api | |
| parent | 07bed4921a05e717a4b7f10a25e3830e346426b7 (diff) | |
| parent | 03981a4c2e9689197e4d2c916c07ae16207b5276 (diff) | |
| download | frameworks_base-f8a5820817eb59e0fe16e3ce0f10bb3dca090192.zip frameworks_base-f8a5820817eb59e0fe16e3ce0f10bb3dca090192.tar.gz frameworks_base-f8a5820817eb59e0fe16e3ce0f10bb3dca090192.tar.bz2 | |
am 03981a4c: Merge "Add activity attribute allowEmbedded" into klp-modular-dev
* commit '03981a4c2e9689197e4d2c916c07ae16207b5276':
Add activity attribute allowEmbedded
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index 288f9a8..408b3f8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -277,6 +277,7 @@ package android { field public static final int allContactsName = 16843468; // 0x10102cc field public static final int allowBackup = 16843392; // 0x1010280 field public static final int allowClearUserData = 16842757; // 0x1010005 + field public static final int allowEmbedded = 16843765; // 0x10103f5 field public static final int allowParallelSyncs = 16843570; // 0x1010332 field public static final int allowSingleTap = 16843353; // 0x1010259 field public static final int allowTaskReparenting = 16843268; // 0x1010204 |