From e88c120ebf42f5a16565414415fa292f5ef9525b Mon Sep 17 00:00:00 2001
From: Deepanshu Gupta <deepanshu@google.com>
Date: Tue, 6 Jan 2015 14:58:37 -0800
Subject: [PATCH] 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
---
 .../src/com/android/tools/layoutlib/create/CreateInfo.java       | 1 -
 1 file changed, 1 deletion(-)

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 7faaed92461a3..ef2d73ae70a22 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",