diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2014-08-06 22:05:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-06 22:05:38 +0000 |
| commit | 72cf03a27a73e91d4a3eabf74e0384b310f4a5b2 (patch) | |
| tree | daedb43ca33e5c9cf2aebc4cf0fff80019530247 /tools/layoutlib/create/src/com/android | |
| parent | 8c71ff298b10ebdd3e5dec6f69f70176161b7e0a (diff) | |
| parent | 3a544a81b3d2d529b2995f4b5db2077760d440b5 (diff) | |
| download | frameworks_base-72cf03a27a73e91d4a3eabf74e0384b310f4a5b2.zip frameworks_base-72cf03a27a73e91d4a3eabf74e0384b310f4a5b2.tar.gz frameworks_base-72cf03a27a73e91d4a3eabf74e0384b310f4a5b2.tar.bz2 | |
am 3a544a81: resolved conflicts for merge of a232a68d to jb-mr1.1-docs
* commit '3a544a81b3d2d529b2995f4b5db2077760d440b5':
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 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", |