diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-08-06 22:18:04 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-06 22:18:04 +0000 |
| commit | f970d2c201649843b8d51d094b865f16b15bc0bc (patch) | |
| tree | 75615ab15cbbba19cfe1e23ec5554cf9c3b0e08f /tools/layoutlib/create | |
| parent | c735197420948ffff757dbe6d00028a87ed09c15 (diff) | |
| parent | 79c3f678d21f6b3c058623217cbe5dd57a553fe8 (diff) | |
| download | frameworks_base-f970d2c201649843b8d51d094b865f16b15bc0bc.zip frameworks_base-f970d2c201649843b8d51d094b865f16b15bc0bc.tar.gz frameworks_base-f970d2c201649843b8d51d094b865f16b15bc0bc.tar.bz2 | |
am 79c3f678: am 206c691b: am 72cf03a2: am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
* commit '79c3f678d21f6b3c058623217cbe5dd57a553fe8':
Fix SystemProperties in LayoutLib.
Diffstat (limited to 'tools/layoutlib/create')
| -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 93cf7d5..fc15157 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", |