diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-13 17:55:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-13 17:55:41 +0000 |
| commit | 872a5a1a93eef53a18d18778104bb8669b4bc073 (patch) | |
| tree | 55c0e9f3d64997cdafc20e130ce03f13b03727ab /tools/layoutlib | |
| parent | 7ce3b5ef64b1a183b75279016e6fc4f65be8c933 (diff) | |
| parent | 01fefec9397569cf9c7c5b599c16126f1b4d6870 (diff) | |
| download | frameworks_base-872a5a1a93eef53a18d18778104bb8669b4bc073.zip frameworks_base-872a5a1a93eef53a18d18778104bb8669b4bc073.tar.gz frameworks_base-872a5a1a93eef53a18d18778104bb8669b4bc073.tar.bz2 | |
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 '01fefec9397569cf9c7c5b599c16126f1b4d6870':
Fix CalendarView to show the right labels. [DO NOT MERGE]
Diffstat (limited to 'tools/layoutlib')
| -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", |