diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 18:01:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 18:01:02 +0000 |
| commit | 567f948b60e9a647610454745b0629c136d492db (patch) | |
| tree | d24eb93b4db64ef97840ac995cc82afc0286b4e0 /tools | |
| parent | 4472b649f975f2ddf6450bfdfd8fd1eae7a92e46 (diff) | |
| parent | 872a5a1a93eef53a18d18778104bb8669b4bc073 (diff) | |
| download | frameworks_base-567f948b60e9a647610454745b0629c136d492db.zip frameworks_base-567f948b60e9a647610454745b0629c136d492db.tar.gz frameworks_base-567f948b60e9a647610454745b0629c136d492db.tar.bz2 | |
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 '872a5a1a93eef53a18d18778104bb8669b4bc073':
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 7b0f8f5..911df7d 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 @@ -136,6 +136,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", |