diff options
| author | 2014-05-13 09:49:18 -0700 | |
|---|---|---|
| committer | 2014-05-13 09:49:18 -0700 | |
| commit | a43aaf00b583e8a88681cdcc6ebe1ae2c52f6f20 (patch) | |
| tree | 164d3fdc2fa10acd8dac0fc46956aad712ab07cc | |
| parent | 888461c801b531f31b2ef34617d333d781d93010 (diff) | |
| parent | 9c00e6739c3d0a11a714a0f654b893531b0f1c5d (diff) | |
resolved conflicts for merge of 9c00e673 to jb-mr1.1-dev
Change-Id: I4ab1b0a71b99692458efc3a67c8a8da3690afb7b
| -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 e9612a3a30de..93cf7d55e61d 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", |