diff options
| author | Deepanshu Gupta <deepanshu@google.com> | 2015-01-06 14:58:37 -0800 |
|---|---|---|
| committer | Deepanshu Gupta <deepanshu@google.com> | 2015-01-06 14:58:37 -0800 |
| commit | e88c120ebf42f5a16565414415fa292f5ef9525b (patch) | |
| tree | 67397a71dfdc03078059bc3a3bfc0ac98b9f598b /tools/layoutlib/create | |
| parent | a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2 (diff) | |
| download | frameworks_base-e88c120ebf42f5a16565414415fa292f5ef9525b.zip frameworks_base-e88c120ebf42f5a16565414415fa292f5ef9525b.tar.gz frameworks_base-e88c120ebf42f5a16565414415fa292f5ef9525b.tar.bz2 | |
resolve conflict for 8c831b2f -> lmp-mr1-dev-plus-aosp again
The earlier resolution (a2a5ce49b29b8e3bf3cd695ff9f968e5579f4be2)
wasn't the right one. This fixes it.
Change-Id: I6a6dc908d3e7dd510064a46df932d129a58eed98
Diffstat (limited to 'tools/layoutlib/create')
| -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", |