From 4e33c4f8b11f763cc6f32179e412b639f668e9d5 Mon Sep 17 00:00:00 2001
From: fionaxu <fionaxu@google.com>
Date: Tue, 7 Jun 2016 17:28:39 -0700
Subject: DO NOT MERGE fix build breakage on k

Bug: 28557603
Change-Id: I3beae9e8cb6315654d7681d484fbb861fa8b1889
---
 core/java/android/content/pm/PackageItemInfo.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/core/java/android/content/pm/PackageItemInfo.java b/core/java/android/content/pm/PackageItemInfo.java
index d862f6b6b328..634ac2902102 100644
--- a/core/java/android/content/pm/PackageItemInfo.java
+++ b/core/java/android/content/pm/PackageItemInfo.java
@@ -16,8 +16,6 @@
 
 package android.content.pm;
 
-import android.annotation.NonNull;
-import android.annotation.SystemApi;
 import android.content.res.XmlResourceParser;
 
 import android.graphics.drawable.Drawable;
@@ -144,8 +142,7 @@ public class PackageItemInfo {
      *
      * @hide
      */
-    @SystemApi
-    public @NonNull CharSequence loadSafeLabel(@NonNull PackageManager pm) {
+    public CharSequence loadSafeLabel(PackageManager pm) {
         // loadLabel() always returns non-null
         String label = loadLabel(pm).toString();
         // strip HTML tags to avoid <br> and other tags overwriting original message
-- 
cgit v1.2.3-59-g8ed1b