Merge from open-source master (40eade14) · Commits · e / os / android_frameworks_base

cmds/pm/src/com/android/commands/pm/Pm.java

+5 −3

Original line number	Original line	Diff line number	Diff line
	@@ -341,10 +341,12 @@ public final class Pm {
	if (nonLocalized != null) {		if (nonLocalized != null) {
	return nonLocalized.toString();		return nonLocalized.toString();
	}		}
			if (res != 0) {
	Resources r = getResources(pii);		Resources r = getResources(pii);
	if (r != null) {		if (r != null) {
	return r.getString(res);		return r.getString(res);
	}		}
			}
	return null;		return null;
	}		}