resolved conflicts for merge of 5476cfee to jb-mr1-dev

Change-Id: I5197271e6fdd36fed9ca9f9b7221d9a99141a4b4

diff --cc tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
index a4a36e3,ff1d82a..b706662
--- 1/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
--- 2/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
+++ b/tools/layoutlib/create/src/com/android/tools/layoutlib/create/CreateInfo.java
@@@ -132,9 -132,6 +132,8 @@@ public final class CreateInfo implement
          "android.graphics.BitmapFactory#finishDecode",
          "android.os.Handler#sendMessageAtTime",
          "android.os.HandlerThread#run",
-         "android.os.Build#getString",
 +        "android.view.Choreographer#getRefreshRate",
 +        "android.view.Display#updateDisplayInfoLocked",
          "android.view.Display#getWindowManager",
          "android.view.LayoutInflater#rInflate",
          "android.view.LayoutInflater#parseInclude",