diff options
| author | Adam Powell <adamp@google.com> | 2012-06-19 19:20:05 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-19 19:20:05 -0700 |
| commit | da8288037cff76367c3088adaa174ddb27bf55c2 (patch) | |
| tree | 596674eefde838f76f330b844214b26914c3554d /api | |
| parent | b56fe8abf6735337b65e050f44e1baf2f3f813ed (diff) | |
| parent | 2dde147b28684fc32f03ad748af8eb87d5408c7c (diff) | |
| download | frameworks_base-da8288037cff76367c3088adaa174ddb27bf55c2.zip frameworks_base-da8288037cff76367c3088adaa174ddb27bf55c2.tar.gz frameworks_base-da8288037cff76367c3088adaa174ddb27bf55c2.tar.bz2 | |
am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev
* commit '2dde147b28684fc32f03ad748af8eb87d5408c7c':
Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
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 308e4d4..49c09b2 100644 --- a/api/current.txt +++ b/api/current.txt @@ -676,6 +676,7 @@ package android { field public static final int measureAllChildren = 16843018; // 0x101010a field public static final int measureWithLargestChild = 16843476; // 0x10102d4 field public static final int mediaRouteButtonStyle = 16843693; // 0x10103ad + field public static final int mediaRouteTypes = 16843694; // 0x10103ae field public static final int menuCategory = 16843230; // 0x10101de field public static final int mimeType = 16842790; // 0x1010026 field public static final int minDate = 16843583; // 0x101033f |