diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-05-12 19:01:41 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-05-12 19:01:41 -0700 |
| commit | 2fb139e02c1e9d2d7c92acf813445a063e73d94f (patch) | |
| tree | e781df18468b5468a781415fa1546c9b54ec6d33 /tools/layoutlib/create | |
| parent | f20c9c660edcce0fe90ba5f8464f726dcd51229e (diff) | |
| parent | 9f2f5e776aed6bfcd87be0b7dd6aa9d22af28817 (diff) | |
| download | frameworks_base-2fb139e02c1e9d2d7c92acf813445a063e73d94f.zip frameworks_base-2fb139e02c1e9d2d7c92acf813445a063e73d94f.tar.gz frameworks_base-2fb139e02c1e9d2d7c92acf813445a063e73d94f.tar.bz2 | |
resolved conflicts for merge of 9f2f5e77 to jb-mr1-dev
Change-Id: Id8cb5e2e9d0c41bdaf767563ebd6e3951ae68a3c
Diffstat (limited to 'tools/layoutlib/create')
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java | 2 |
1 files changed, 2 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 80a1a60..fb8272a 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 @@ -112,6 +112,8 @@ public final class CreateInfo implements ICreateInfo { "android.os.Build#getString", "android.view.Choreographer#getRefreshRate", "android.view.Display#updateDisplayInfoLocked", + "android.view.Display#getWindowManager", + "android.text.format.Time#format1", "android.view.LayoutInflater#rInflate", "android.view.LayoutInflater#parseInclude", "android.view.View#isInEditMode", |