diff options
| author | 2016-07-21 19:22:25 +0000 | |
|---|---|---|
| committer | 2016-07-21 19:22:27 +0000 | |
| commit | 9e04446d6f3c71af6e2986cc679e4af11496d24b (patch) | |
| tree | da380478a8cc8535b36a54313806e9cd52738d40 | |
| parent | dee7dffb5df66d5a2f3c6a73d747697937a70f42 (diff) | |
| parent | 79621c94ce0cf7957c1121a12e6e716b350cce47 (diff) | |
Merge "Update current.txt to reflect result type change" into nyc-mr1-dev
| -rw-r--r-- | api/current.txt | 2 | ||||
| -rw-r--r-- | api/system-current.txt | 2 | ||||
| -rw-r--r-- | api/test-current.txt | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt index 5263c26258df..c8c284de16ef 100644 --- a/api/current.txt +++ b/api/current.txt @@ -10066,7 +10066,7 @@ package android.content.pm { method public android.os.PersistableBundle getExtras(); method public java.lang.String getId(); method public android.content.Intent getIntent(); - method public android.content.Intent getIntents(); + method public android.content.Intent[] getIntents(); method public long getLastChangedTimestamp(); method public java.lang.CharSequence getLongLabel(); method public java.lang.String getPackage(); diff --git a/api/system-current.txt b/api/system-current.txt index 07a88252d942..35d3f333a9b7 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -10491,7 +10491,7 @@ package android.content.pm { method public android.os.PersistableBundle getExtras(); method public java.lang.String getId(); method public android.content.Intent getIntent(); - method public android.content.Intent getIntents(); + method public android.content.Intent[] getIntents(); method public long getLastChangedTimestamp(); method public java.lang.CharSequence getLongLabel(); method public java.lang.String getPackage(); diff --git a/api/test-current.txt b/api/test-current.txt index bdbebb5acf10..aa5e892fdfd4 100644 --- a/api/test-current.txt +++ b/api/test-current.txt @@ -10079,7 +10079,7 @@ package android.content.pm { method public android.os.PersistableBundle getExtras(); method public java.lang.String getId(); method public android.content.Intent getIntent(); - method public android.content.Intent getIntents(); + method public android.content.Intent[] getIntents(); method public long getLastChangedTimestamp(); method public java.lang.CharSequence getLongLabel(); method public java.lang.String getPackage(); |