Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47"

This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44.

Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master.

Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b

1 files changed, 0 insertions, 7 deletions

diff --git a/java/com/android/incallui/CallerInfoUtils.java b/java/com/android/incallui/CallerInfoUtils.java
index 8f2310760..564446647 100644
--- a/java/com/android/incallui/CallerInfoUtils.java
+++ b/java/com/android/incallui/CallerInfoUtils.java
@@ -282,11 +282,4 @@ public class CallerInfoUtils {
         });
     loader.startLoading();
   }
-
-  /** @return conference name for conference call. */
-  public static String getConferenceString(Context context, boolean isGenericConference) {
-    final int resId =
-        isGenericConference ? R.string.generic_conference_call_name : R.string.conference_call_name;
-    return context.getResources().getString(resId);
-  }
 }