Merge "resolve merge conflicts of afed6f86 to nyc-dev" into nyc-dev

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;

 */

public class PackageItemInfo {

    private static final float MAX_LABEL_SIZE_PX = 500f;

    /**

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

     */