Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9819bae authored by Chen Xu's avatar Chen Xu Committed by android-build-merger
Browse files

Merge \\"resolve merge conflicts of afed6f86 to nyc-dev\\" into nyc-dev am: 0c4f1c7e

am: bee500e3

Change-Id: I7c1ad4e3fa9b1bab21ab931be6ccaae33e89f20b
parents 57e0e834 bee500e3
Loading
Loading
Loading
Loading
+4 −3
Original line number Diff line number Diff line
@@ -29,7 +29,9 @@ import android.text.Html;
import android.text.TextPaint;
import android.text.TextUtils;
import android.util.Printer;

import android.text.BidiFormatter;
import android.text.TextPaint;
import android.text.Html;
import java.text.Collator;
import java.util.Comparator;

@@ -44,7 +46,6 @@ import java.util.Comparator;
 */
public class PackageItemInfo {
    private static final float MAX_LABEL_SIZE_PX = 500f;

    /**
     * Public name of this item. From the "android:name" attribute.
     */