diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 18:15:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 18:15:58 +0000 |
| commit | 425645c738f200b44d0c9344ec286562a841d155 (patch) | |
| tree | 421cae1b515b99d073dba6515da34f6c7433cd02 /tools | |
| parent | 3144fde70f16a11a004dc95ca6f6f0f61db57638 (diff) | |
| parent | 567f948b60e9a647610454745b0629c136d492db (diff) | |
| download | frameworks_base-425645c738f200b44d0c9344ec286562a841d155.zip frameworks_base-425645c738f200b44d0c9344ec286562a841d155.tar.gz frameworks_base-425645c738f200b44d0c9344ec286562a841d155.tar.bz2 | |
am 567f948b: am 872a5a1a: am 01fefec9: am 5fc8f945: am b0f2ded5: am 40db4a13: am 9ddb073b: am c70ce72a: am af9fde96: am 425addb9: am a43aaf00: resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
* commit '567f948b60e9a647610454745b0629c136d492db':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java index 813a895..59979ce 100644 --- a/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java +++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java @@ -137,6 +137,7 @@ public final class CreateInfo implements ICreateInfo { "android.text.format.DateFormat#is24HourFormat", "android.view.Choreographer#getRefreshRate", "android.view.Display#updateDisplayInfoLocked", + "android.view.Display#getWindowManager", "android.view.LayoutInflater#rInflate", "android.view.LayoutInflater#parseInclude", "android.view.View#isInEditMode", |