summaryrefslogtreecommitdiffstats
path: root/api/current.txt
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-09-23 12:58:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-09-23 12:58:10 -0700
commitb939e35274334d1f5e71a526efe8d235eb6d7387 (patch)
tree9292319858bd01ec3bd01f132405c9a13620ed7e /api/current.txt
parent925b6a715f42296dee7d80c3a3b4024d264a3c97 (diff)
parent8da429e80d1778d7bcfbfbd64355c70fb466b3ce (diff)
downloadframeworks_base-b939e35274334d1f5e71a526efe8d235eb6d7387.zip
frameworks_base-b939e35274334d1f5e71a526efe8d235eb6d7387.tar.gz
frameworks_base-b939e35274334d1f5e71a526efe8d235eb6d7387.tar.bz2
Merge "Fix issue #7209355, #7214271." into jb-mr1-dev
Diffstat (limited to 'api/current.txt')
-rw-r--r--api/current.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt
index 0b759b2..7eabad8 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -6770,6 +6770,7 @@ package android.content.pm {
public class ResolveInfo implements android.os.Parcelable {
ctor public ResolveInfo();
+ ctor public ResolveInfo(android.content.pm.ResolveInfo);
method public int describeContents();
method public void dump(android.util.Printer, java.lang.String);
method public final int getIconResource();