diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-01-07 00:57:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-07 00:57:22 +0000 |
| commit | 416891cff2349ddf303d3d52a5cea62903228dc0 (patch) | |
| tree | 57cd4b5545b089234caae73b44fd87c47adda804 /tools/layoutlib | |
| parent | 25bb2daec6a5782b7ddb9c8dcc19289651d4b5fe (diff) | |
| parent | 27ce2763325bcb7940232a11892e12fb86053cf7 (diff) | |
| download | frameworks_base-416891cff2349ddf303d3d52a5cea62903228dc0.zip frameworks_base-416891cff2349ddf303d3d52a5cea62903228dc0.tar.gz frameworks_base-416891cff2349ddf303d3d52a5cea62903228dc0.tar.bz2 | |
am 27ce2763: Merge "resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again" into lmp-mr1-dev-plus-aosp
* commit '27ce2763325bcb7940232a11892e12fb86053cf7':
resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again
Diffstat (limited to 'tools/layoutlib')
| -rw-r--r-- | tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java | 1 |
1 files changed, 0 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 7faaed9..ef2d73a 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 @@ -228,7 +228,6 @@ public final class CreateInfo implements ICreateInfo { "android.os.SystemProperties", "android.text.AndroidBidi", "android.text.StaticLayout", - "android.util.FloatMath", "android.view.Display", "libcore.icu.DateIntervalFormat", "libcore.icu.ICU", |