diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-08-06 22:37:10 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-06 22:37:10 +0000 |
| commit | 7b561be3a6fedebfce412cecd8c36d6686f6576c (patch) | |
| tree | c030bef5bff5e0fed885dadffbaa04c4bb0a94fa /tools/layoutlib/create/src/com/android | |
| parent | b86675f14bea0c833f0ac3f0ec4d3e5f46784569 (diff) | |
| parent | 09c3c2edb2391d3ffed9a07ec360b9f75b9f7637 (diff) | |
| download | frameworks_base-7b561be3a6fedebfce412cecd8c36d6686f6576c.zip frameworks_base-7b561be3a6fedebfce412cecd8c36d6686f6576c.tar.gz frameworks_base-7b561be3a6fedebfce412cecd8c36d6686f6576c.tar.bz2 | |
am 09c3c2ed: am ba31d628: am db94ea9e: am f970d2c2: am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
* commit '09c3c2edb2391d3ffed9a07ec360b9f75b9f7637':
Fix SystemProperties in LayoutLib.
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 911df7d..4705dec 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.text.format.DateFormat#is24HourFormat", "android.view.Choreographer#getRefreshRate", "android.view.Display#updateDisplayInfoLocked", @@ -192,6 +191,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", |