diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-08-06 14:41:02 -0700 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2014-08-06 14:41:02 -0700 |
| commit | a232a68d4ccf2960350adff6af99a52bde2b021d (patch) | |
| tree | 0426f2e5c60e22976a032f1a7c9ae47c202dc76e /tools/layoutlib/create/src/com/android | |
| parent | 9c48ab82084828087c47086f2379b4927ec057e2 (diff) | |
| parent | 5476cfee6b8b5e17a7fa72bb141ca95ef913a4f5 (diff) | |
| download | frameworks_base-a232a68d4ccf2960350adff6af99a52bde2b021d.zip frameworks_base-a232a68d4ccf2960350adff6af99a52bde2b021d.tar.gz frameworks_base-a232a68d4ccf2960350adff6af99a52bde2b021d.tar.bz2 | |
resolved conflicts for merge of 5476cfee to jb-mr1-dev
Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4
Diffstat (limited to 'tools/layoutlib/create/src/com/android')
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java | 2 |
1 files changed, 1 insertions, 1 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 a4a36e3..b706662 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 @@ -132,7 +132,6 @@ public final class CreateInfo implements ICreateInfo { "android.graphics.BitmapFactory#finishDecode", "android.os.Handler#sendMessageAtTime", "android.os.HandlerThread#run", - "android.os.Build#getString", "android.view.Choreographer#getRefreshRate", "android.view.Display#updateDisplayInfoLocked", "android.view.Display#getWindowManager", @@ -191,6 +190,7 @@ public final class CreateInfo implements ICreateInfo { "android.graphics.Typeface", "android.graphics.Xfermode", "android.os.SystemClock", + "android.os.SystemProperties", "android.text.AndroidBidi", "android.text.format.Time", "android.util.FloatMath", |