diff options
| author | Adam Powell <adamp@google.com> | 2012-06-19 19:18:34 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-19 19:18:34 -0700 |
| commit | 2dde147b28684fc32f03ad748af8eb87d5408c7c (patch) | |
| tree | efd3a5c5dcefee24bb36b453381b71a7fd25b427 /api | |
| parent | f96d117e9bf2d5998677521330697628c95ec3f1 (diff) | |
| parent | 849df0b5a7a5ef72610d687a8b1c2f0a23f873ab (diff) | |
| download | frameworks_base-2dde147b28684fc32f03ad748af8eb87d5408c7c.zip frameworks_base-2dde147b28684fc32f03ad748af8eb87d5408c7c.tar.gz frameworks_base-2dde147b28684fc32f03ad748af8eb87d5408c7c.tar.bz2 | |
Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev
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 4a23046..6072ad9 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 |